PHP 5.5 compatibility - Small improvements