Fix up issues with handling SuperClasses