Couple of tweaks to how we track current map views