row fixes

Change-Id: I7c0cb105f30ffc018a63fb636b017473e984275a