pjeby More fixes for newer PHP versions