Re: Improve default machine type selection