Fix import bug interactions