Fix some issues with the ItemCount and RowItemText functionality