Fixing static analysis / Clang warnings