Tweaks to maps block