hhvm fixes - part 4