Fixup missing type -> map_icon mappings. Remove some debug output.