Fix Comparable troubles