Fixing a couple of signed/unsigned mismatch warnings
Added missing const specifiers