diff --git a/ChangeLog b/ChangeLog
index 44976be3..20b84f62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23932,3 +23932,6 @@
 	instantiated with invalid segue level values.
 2023-01-18 Fred Gleason <fredg@paravelsystems.com>
 	* Modified the 'cwrap' helper to emit C++ compatible output.
+2023-01-18 Fred Gleason <fredg@paravelsystems.com>
+	* Cleaned up compiler warnings when building rdadmin(1).
+	* Cleaned up compiler warnings when building rddbconfig(8).
diff --git a/rdadmin/Makefile.am b/rdadmin/Makefile.am
index 86d114c9..faa8687f 100644
--- a/rdadmin/Makefile.am
+++ b/rdadmin/Makefile.am
@@ -30,10 +30,10 @@ moc_%.cpp:	%.h
 	$(MOC) $< -o $@
 
 # The cwrap dependencies
-global_gpl2.c:	
-	$(CWRAP) -o global_gpl2.c gpl2.html
-global_credits.c:	
-	$(CWRAP) -o global_credits.c ../AUTHORS
+global_gpl2.cpp:	
+	$(CWRAP) -o global_gpl2.cpp gpl2.html
+global_credits.cpp:	
+	$(CWRAP) -o global_credits.cpp ../AUTHORS
 
 # I18N Stuff
 install-exec-local:	
@@ -128,8 +128,8 @@ dist_rdadmin_SOURCES = add_feed.cpp add_feed.h\
                        view_node_info.cpp view_node_info.h\
                        view_pypad_errors.cpp view_pypad_errors.h
 
-nodist_rdadmin_SOURCES = global_credits.c\
-                         global_gpl2.c\
+nodist_rdadmin_SOURCES = global_credits.cpp\
+                         global_gpl2.cpp\
                          moc_add_feed.cpp\
                          moc_add_group.cpp\
                          moc_add_matrix.cpp\
@@ -227,8 +227,8 @@ EXTRA_DIST = gpl2.html\
              xpm_info_banner2.cpp
 
 CLEANFILES = *~\
-             global_credits.c\
-             global_gpl2.c\
+             global_credits.cpp\
+             global_gpl2.cpp\
              *.qm\
              moc_*
 
diff --git a/rdadmin/rdadmin.cpp b/rdadmin/rdadmin.cpp
index 954ba4e8..e4994720 100644
--- a/rdadmin/rdadmin.cpp
+++ b/rdadmin/rdadmin.cpp
@@ -91,7 +91,7 @@ MainWidget::MainWidget(RDConfig *config,RDWidget *parent)
     }
   }
 
-  for(int i=0;i<rda->cmdSwitch()->keys();i++) {
+  for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
     if(rda->cmdSwitch()->key(i)=="--add-host-entry") {
       if(geteuid()==0) {
 	admin_add_host_entry=true;
diff --git a/utils/rddbconfig/rddbconfig.cpp b/utils/rddbconfig/rddbconfig.cpp
index 1c7c6929..6c7acec5 100644
--- a/utils/rddbconfig/rddbconfig.cpp
+++ b/utils/rddbconfig/rddbconfig.cpp
@@ -495,7 +495,7 @@ bool MainWidget::RunProcess(int *exit_code,QString *err_msg,const QString &cmd,
   }
   else {
     *exit_code=-1;
-    *err_msg="\"+cmd\ "+tr("process crashed");
+    *err_msg="\"+cmd\" "+tr("process crashed");
   }
   QApplication::restoreOverrideCursor();