Clang detected errors corrected.