More minor message updates