Tweaks and niceties