Win phone fixes