Fixes concerning Windows OS