Fix hhvm test failures