Fixing mistakes in import grouping.