Minor tweaks to Leslie's map stuff