Minor updates for testing winrt build