Type fixes for rows