More minor suggestions from Mark