PROV-913: Fixes for PHP 5.3