[TASK] PHP 5.4 adjustments