More HHVM fixes.