Fixing the nullsafe comaprators.