HHVM Fixes (Take 3)

Is this any better?