fixes for Windows version