Fixes for ROW

Change-Id: I55239afa8f306979c75c9fa2bf64cb74b714d927