Minor changes for hhvm support.
Merge pull request #164 from F21/hhvm-support

Minor changes for hhvm support.