More unique col name fixes