Tweaks to improve performance around translations?