More divider sorting fixes