diff --git a/config.c b/config.c
index e3eec096..8376877a 100644
--- a/config.c
+++ b/config.c
@@ -571,6 +571,9 @@ parse_line(char *buf, char *name, char *value)
  * changeable options:
  * - failover
  * - follow_command
+ * - logfacility
+ * - logfile
+ * - loglevel
  * - master_response_timeout
  * - monitor_interval_secs
  * - priority
@@ -583,7 +586,6 @@ parse_line(char *buf, char *name, char *value)
  * non-changeable options:
  * - cluster_name
  * - conninfo
- * - logfile
  * - node
  * - node_name
  *
@@ -595,7 +597,7 @@ bool
 reload_config(t_configuration_options *orig_options)
 {
 	PGconn	   *conn;
-	t_configuration_options new_options;
+	t_configuration_options new_options = T_CONFIGURATION_OPTIONS_INITIALIZER;
 	bool	  config_changed = false;
 	bool	  log_config_changed = false;
 
diff --git a/repmgrd.c b/repmgrd.c
index bdc1e344..037d820f 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -654,8 +654,8 @@ witness_monitor(void)
 				 * Update the repl_nodes table from the new master to reflect the changed
 				 * node configuration
 				 *
-				 * XXX it would be neat to be able to handle this with e.g. table-based
-				 * logical replication
+				 * It would be neat to be able to handle this with e.g. table-based
+				 * logical replication if available in core
 				 */
 				witness_copy_node_records(master_conn, my_local_conn, local_options.cluster_name);
 
@@ -1014,8 +1014,8 @@ standby_monitor(void)
 				 *
 				 * We should log a message so the user knows of the situation at hand.
 				 *
-				 * XXX check if the original master is still active and display a
-				 * warning
+				 * XXX check if the original master is still active and display a warning
+				 * XXX add event notification
 				 */
 				log_err(_("It seems this server was promoted manually (not by repmgr) so you might by in the presence of a split-brain.\n"));
 				log_err(_("Check your cluster and manually fix any anomaly.\n"));