Clang warning fixes