hhvm fixes - part 3