fixes in WPF VarTab