Added some fixes from testing the app on Windows.