Tweaks to public map