Further tweaks to Transactions