Tweaks to aid documentation