Trying to fix more stuff