fixes for hhvm