A few Small fixes for the WPF Designer