more fixes for Windows