Another map fixes
Another map changes
fetFlatIcon runtime error fix?