Fixed HHVM incompatibilities