Loot of fixes.