Fixed some Windows issues