Minor changes for hhvm support.

A few changes so we can support hhvm.