Sorting and pom fixes