More fixing for Compliance with HHVM