more windows build work