Fixing Clang warnings and a typo.