SSP-1077 Fix up mismatched column widths