Warning cleanup

Remove some warnings when compiling with `clang`.