Fix columns missing issues