columnMap fixes