Update to windows build - make more things windows only.