Woring in SL and WPF
WPF & SL fixes