Fix TW-Issues