A number of changes that should fix Kingdoms errors