Fix all hhvm things for #52