Some more minor improvements.