Fix comparison.
Change row and header helpers.