Couple fixes for better experience on Windows