Lint fixes
Next attempt at getting the cell right.