Fix some minor, possible issues reported by clang