Lots more fixes.