Several more fixes.