TAW fix and adjustment.