fixes with row, and a few others generating warnings