I was able to deal with this - basically not picking up Jupiter swaps because it splits up the swaps etc.
One question I have, my deposits and withdrawals are fucked up - can I just delete all of these? I don't think it matters for tax reasons as I'm not using lots, just LIFO method, but want to make sure it won't alter my tax calculations.