Fixes for adjusting row index to model