Tweaks to restore some spacing I liked better