HHVM Fixes (Take 2)