Bunch more fixes.