Fixes for HHVM