Attempt at fixing HHVM support