Updates to fix WinPRT behaviors