hhvm fixes - part 1