fix more policy stuff