Small fixes. Binding WPF version ready.