Committing fixes for sorting