Merge "Fix int compared to unsigned int warnings."