HHVM workarounds

makes test pass under HHVM