Small changes to turn off compilation warnings on signed/unsigned numbers