Fix PHP 5.5 strict issues