more windows build fixes