Fixes for Windows Phone 8