fixes for Windows