Still more changes to spec files