Fix column/well issues