Some more fixes concerning Windows OS

Windows OS fix continue.