Fixed staff and roster sort order.