Resolve windows build from Gary