Minor PHP7.3+ fixes