Fixes in windows phone support