fix more visibilty issues