diff --git a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
--- a/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
+++ b/openmp/libomptarget/plugins-nextgen/common/PluginInterface/PluginInterface.cpp
@@ -455,7 +455,7 @@
 
   if (RPCHandle)
     if (auto Err = RPCHandle->deinitDevice())
-      return std::move(Err);
+      return Err;
 
   return deinitImpl();
 }
@@ -549,7 +549,7 @@
     return Plugin::success();
 
   if (auto Err = Server.initDevice(*this, Plugin.getGlobalHandler(), Image))
-    return std::move(Err);
+    return Err;
 
   auto DeviceOrErr = Server.getDevice(*this);
   if (!DeviceOrErr)
diff --git a/openmp/libomptarget/src/private.h b/openmp/libomptarget/src/private.h
--- a/openmp/libomptarget/src/private.h
+++ b/openmp/libomptarget/src/private.h
@@ -257,7 +257,9 @@
 #endif
 
 #define TARGET_NAME Libomptarget
+#ifndef DEBUG_PREFIX
 #define DEBUG_PREFIX GETNAME(TARGET_NAME)
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 /// dump a table of all the host-target pointer pairs on failure