fix some Windows issues