more transaction fixes