Fix some Windows issues