Some minor cleaning up of some user messages.