HHVM Fixes (Original)

Take 2 doesn't work...