fixed various import issues