Fix up dropping of columns