Some more minor fixes