Few updates for PHP 5.5