Tweaks to functions.