Tweaks to definitions