Similarly for a few of the other logged warning additions in this PR