Add Fixes for hhvm