Tweaks to abstract spacing