TAW tweak and fix.