Comparator fixes in Location