Tweaks and Maps fixes