Fix a couple compiler warnings about "array subscript has type ‘char’"
and other minor things.
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  Fix a couple compiler warnings about "array subscript has type ‘char’" and other minor things.