More transaction management changes