Fix bugs where map layers didn't have icons, contractors didn't have names.