A few more fixes.