Some more minor improvements