Fix comments and messages.