Change a couple of types to avoid signed comparison warnings