Fixes in TupleComparator and BasicTypeComparator