Corrected import issues