WIP - another HHVM fixes