More fixes around concurrency and transactions