Merge "Fixing comparison types." into sc-dev