More two-column fixes