Tweaks for spacing