some more fixes for the windows version