Fixed: better selection of make util.