Merge "Fix sign-compare warnings"