Adds hhvm
Fixes wrong class usage
Fixes CS