Tweaks to anchoring calculations