Fix around concurrent locking and transactions