HHVM Fixes (Take 4)