Fixed couple of issues with windows build, still failing