Fix a couple of the worst clang warnings