Updates for PHP 5.5