Cleaned up some confusion among the messages.