Try to fix more validation warnings