fix more hphp detected issues