Some more minor fixes.