More adjustments to new PHP version!