More convention and spacing adjustments