Fixes issues with HHVM and the template engine test suite