Preparing for PHP 5.6