Fixed PHP 5.4 issues