Fixed column issues