Fix sort order and main member