More minor improvements