More minor improvements.