Fix up compareTo method