Some more comparision fixes