Fix up some vestigal elements