[WIP][HHVM] Fixes

Anyone is invited to send patches to this branch