fix import and fix computation of components in use