TW few demenge fixes