Some transaction fixes