Fix some issues that the Clang compiler is warning us about