More minor improvements (2)