fix more consistency issues