hhvm commit and minor changes