fix more messages