Final set of fixes.