WinRT fixes