Removing more warnings due to comparison between unsigned and signed integers