Improve default machine type selection