Various changes for Windows Phone