Some more fixing in the make(1) files