Sort order fixes