Further tweaks to address Travis CI failure on PHP 5.3