Fix up inheritance for some of the ::Server roles