After-final fixes.
