Comparable is Raw type
Small changes