Attempt to fix Clang warnings