Merge "Fixing comparison types."