Merge "Fix signed vs. unsigned mismatch warnings"