Minor fixes to get rid of  "signed/unsigned mismatch warnings"