HHVM Fixes (Take 3 - The Working Version)

Is this any better?