More column issues fixed