Misc fixes for the windows app