hhvm fixes - part 2