fix class/struct mismatch picked up as a warning by clang
remove char-subscript warnings for clang