Fix issues with columns