Addressing minor issues caught by clang static analysis