Merge "Fix Clang warnings/errors"