Some adjustments to tnt