diff --git a/libhive/libhive.pro b/libhive/libhive.pro
index c8c55c65..7b017d07 100644
--- a/libhive/libhive.pro
+++ b/libhive/libhive.pro
@@ -1,6 +1,8 @@
 TARGET = hive
 TEMPLATE = lib
 
+CONFIG += c++11
+
 target.path = /usr/lib
 INSTALLS += target
 
diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.pro b/plugins/deviceplugins/devicepluginelro/devicepluginelro.pro
index 2db9f266..8ea5b3b3 100644
--- a/plugins/deviceplugins/devicepluginelro/devicepluginelro.pro
+++ b/plugins/deviceplugins/devicepluginelro/devicepluginelro.pro
@@ -1,11 +1,7 @@
-TEMPLATE = lib
-CONFIG += plugin static
+include(../../plugins.pri)
 
 TARGET = $$qtLibraryTarget(hive_devicepluginelro)
 
-INCLUDEPATH += ../../../libhive
-LIBS += -L../../../libhive -lhive
-
 SOURCES += \
     devicepluginelro.cpp
 
diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro
index c4f66002..b7aaca21 100644
--- a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro
+++ b/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro
@@ -1,11 +1,7 @@
-TEMPLATE = lib
-CONFIG += plugin static
+include (../../plugins.pri)
 
 TARGET = $$qtLibraryTarget(hive_devicepluginintertechno)
 
-INCLUDEPATH += ../../../libhive
-LIBS += -L../../../libhive -lhive
-
 SOURCES += \
     devicepluginintertechno.cpp
 
diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.pro b/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.pro
index c77c90ef..483fb17e 100644
--- a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.pro
+++ b/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.pro
@@ -1,11 +1,7 @@
-TEMPLATE = lib
-CONFIG += plugin static
+include(../../plugins.pri)
 
 TARGET = $$qtLibraryTarget(hive_devicepluginmeisteranker)
 
-INCLUDEPATH += ../../../libhive
-LIBS += -L../../../libhive -lhive
-
 SOURCES += \
     devicepluginmeisteranker.cpp
 
diff --git a/plugins/plugins.pri b/plugins/plugins.pri
new file mode 100644
index 00000000..8acff450
--- /dev/null
+++ b/plugins/plugins.pri
@@ -0,0 +1,6 @@
+TEMPLATE = lib
+CONFIG += plugin static c++11
+
+INCLUDEPATH += ../../../libhive
+LIBS += -L../../../libhive -lhive
+
diff --git a/server/jsonrpcserver.cpp b/server/jsonrpcserver.cpp
index 84d200e5..25deb4fc 100644
--- a/server/jsonrpcserver.cpp
+++ b/server/jsonrpcserver.cpp
@@ -75,6 +75,8 @@ void JsonRPCServer::processData(int clientId, const QByteArray &jsonData)
             case DeviceManager::DeviceErrorMissingParameter:
                 sendErrorResponse(clientId, commandId, "Error creating device. Missing parameter.");
                 break;
+            default:
+                sendErrorResponse(clientId, commandId, "Unknown error.");
             }
         } else if (method == "GetConfiguredDevices") {
             QVariantMap rspParams;
@@ -157,6 +159,8 @@ void JsonRPCServer::handleActionMessage(int clientId, int commandId, const QStri
         case DeviceManager::DeviceErrorDeviceNotFound:
             sendErrorResponse(clientId, commandId, "No such device");
             break;
+        default:
+            sendErrorResponse(clientId, commandId, "Unknown error.");
         }
     }
 }
diff --git a/server/server.pro b/server/server.pro
index e455509b..28a77b1f 100644
--- a/server/server.pro
+++ b/server/server.pro
@@ -7,6 +7,7 @@ target.path = /usr/bin
 INSTALLS += target
 
 QT += network
+CONFIG += c++11
 
 LIBS += -L../libhive/ -lhive