Trying to fix more errors