Trying to fix more golang stuff