fix more injection bugs