fix more leftovers (for crying out loud...)