More transaction fixes