Fixing missing sections and ordering.