Fix column ordering.