More fixes (reverted some of the rows)