fix hhvm and cs errors