Fixes in Comparer