Still tweaking towards HHVM