Fix HHVM test failures