Minor tweaks and updates
HHVM