added fixes for windows phone