Fixup clang warnings

I had ignored these for a while, it's nice to get rid of this and have clean
builds again.