A few other general fixes.