diff --git a/Transceiver/HamlibTransceiver.cpp b/Transceiver/HamlibTransceiver.cpp
index 13b08ed6f..0ae5cd65c 100644
--- a/Transceiver/HamlibTransceiver.cpp
+++ b/Transceiver/HamlibTransceiver.cpp
@@ -161,6 +161,7 @@ void HamlibTransceiver::register_transceivers (logger_type * logger,
 {
   rig_set_debug_callback (debug_callback, logger);
   rig_set_debug (RIG_DEBUG_TRACE);
+  BOOST_LOG_SEV (*logger, boost::log::trivial::info) << "Hamlib version: " << rig_version ();
   rig_load_all_backends ();
   rig_list_foreach (register_callback, registry);
 }
diff --git a/lib/wsprd/wsprd.c b/lib/wsprd/wsprd.c
index 8ef66fd19..eea667ebb 100644
--- a/lib/wsprd/wsprd.c
+++ b/lib/wsprd/wsprd.c
@@ -738,7 +738,7 @@ int main(int argc, char *argv[])
     signed char message[]={-9,13,-35,123,57,-39,64,0,0,0,0};
     char *callsign, *grid,  *call_loc_pow;
     char *ptr_to_infile,*ptr_to_infile_suffix;
-    char *data_dir=NULL;
+    char *data_dir=".";
     char wisdom_fname[200],all_fname[200],spots_fname[200];
     char timer_fname[200],hash_fname[200];
     char uttime[5],date[7];
@@ -905,11 +905,11 @@ int main(int argc, char *argv[])
     strcpy(timer_fname,".");
     strcpy(hash_fname,".");
     if(data_dir != NULL) {
-        strcpy(wisdom_fname,data_dir);
-        strcpy(all_fname,data_dir);
-        strcpy(spots_fname,data_dir);
-        strcpy(timer_fname,data_dir);
-        strcpy(hash_fname,data_dir);
+      strncpy(wisdom_fname,data_dir, sizeof wisdom_fname);
+      strncpy(all_fname,data_dir, sizeof all_fname);
+      strncpy(spots_fname,data_dir, sizeof spots_fname);
+      strncpy(timer_fname,data_dir, sizeof timer_fname);
+      strncpy(hash_fname,data_dir, sizeof hash_fname);
     }
     strncat(wisdom_fname,"/wspr_wisdom.dat",20);
     strncat(all_fname,"/ALL_WSPR.TXT",20);