fix more stupid type stuff