Fix doTransactions errors
Merge origin/master