Fix PHP 5.4 compatibility bugs