More work on HHVM support