HHVM Parity and several other fixes