HHVM fixes
Merge pull request #201 from GrahamCampbell/hhvm

HHVM Fixes