Row-fluid fixes