Fixed FIXMEs
Minor
Persist map location