Fix up unconfirmed transfer handling