Minor changes to remove warnings related to comparison between signed and unsigned integers