Fixed bugs with missing columns