Last set of fixes.