Fixed issues with windows phone