Last round of fixes for transaction stuff