Some fixes for tests broken on HHVM.