Attempts to fix more issues