Tweaks to make things prettier