Fix import special handling