Tons more fixes.