Its in a standalone "fix compiler warnings" commit, I'll move it out into separate PR
But yes, its giving me notices