Fixed some Windows issues.