diff --git a/ChangeLog b/ChangeLog
index d29bb64b..ffffb180 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22274,3 +22274,10 @@
 2021-08-15 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed regressions in rdlogmanager(1) that caused the 'Color'
 	setting for Events and Clocks to fail to be saved.
+2021-08-15 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a bug in rdadmin(1) that caused a newly created Group
+	record to fail to get an icon in the Group List.
+	* Fixed a bug in rdadmin(1) that could cause a segfault when
+	creating a new Service entry.
+	* Fixed a bug in rdadmin(1) that could cause a segfault when
+	creating a new Schedule Code entry.
diff --git a/lib/rdgrouplistmodel.cpp b/lib/rdgrouplistmodel.cpp
index 78e5e91e..8db01bb1 100644
--- a/lib/rdgrouplistmodel.cpp
+++ b/lib/rdgrouplistmodel.cpp
@@ -349,7 +349,7 @@ void RDGroupListModel::updateRowLine(int line)
 {
   if(line<d_texts.size()) {
     QString sql=sqlFields()+
-      "where `NAME`='"+RDEscapeString(d_texts.at(line).at(line).toString())+"'";
+      "where `NAME`='"+RDEscapeString(d_texts.at(line).at(0).toString())+"'";
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
       updateRow(line,q);
diff --git a/lib/rdschedcodelistmodel.cpp b/lib/rdschedcodelistmodel.cpp
index 5b7b82cb..2e771d62 100644
--- a/lib/rdschedcodelistmodel.cpp
+++ b/lib/rdschedcodelistmodel.cpp
@@ -243,7 +243,7 @@ void RDSchedCodeListModel::updateRowLine(int line)
 {
   if(line<d_texts.size()) {
     QString sql=sqlFields()+
-      "where `CODE`='"+RDEscapeString(d_texts.at(line).at(line).toString())+"'";
+      "where `CODE`='"+RDEscapeString(d_texts.at(line).at(0).toString())+"'";
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
       updateRow(line,q);
diff --git a/lib/rdservicelistmodel.cpp b/lib/rdservicelistmodel.cpp
index e8bed694..a3802197 100644
--- a/lib/rdservicelistmodel.cpp
+++ b/lib/rdservicelistmodel.cpp
@@ -264,7 +264,7 @@ void RDServiceListModel::updateRowLine(int line)
 {
   if(line<d_texts.size()) {
     QString sql=sqlFields()+
-      "where `NAME`='"+RDEscapeString(d_texts.at(line).at(line).toString())+"'";
+      "where `NAME`='"+RDEscapeString(d_texts.at(line).at(0).toString())+"'";
     RDSqlQuery *q=new RDSqlQuery(sql);
     if(q->first()) {
       updateRow(line,q);