Tdc: Some cleanups
Some fixes