Fix issues reported by CLANG