Major fixes to HHVM Role