hhvm changes from Sanuch