Correction of more import issues