Some more general fixes.