Fixing iOS clang warnings, part 2