More minor adjustments for spacing