Various final fixes.