More fixing for PHP upgrade