Few more fixes for Windows