Fixed remaining column issues