diff --git a/include/villas/api/session.hpp b/include/villas/api/session.hpp
index 299c6342c..794d977f5 100644
--- a/include/villas/api/session.hpp
+++ b/include/villas/api/session.hpp
@@ -44,11 +44,14 @@ namespace api {
 /* Forward declarations */
 class Request;
 class Response;
+class StatusRequest;
 
 /** A connection via HTTP REST or WebSockets to issue API requests. */
 class Session {
 
 public:
+	friend StatusRequest; /**< Requires access to wsi */
+
 	enum State {
 		ESTABLISHED,
 		SHUTDOWN
diff --git a/lib/api/requests/capabiltities.cpp b/lib/api/requests/capabiltities.cpp
index 5a6965d3c..82750bd30 100644
--- a/lib/api/requests/capabiltities.cpp
+++ b/lib/api/requests/capabiltities.cpp
@@ -21,6 +21,7 @@
  *********************************************************************************/
 
 #include <villas/config.h>
+#include <villas/plugin.h>
 #include <villas/hook.hpp>
 #include <villas/api/request.hpp>
 #include <villas/api/response.hpp>
diff --git a/lib/api/requests/restart.cpp b/lib/api/requests/restart.cpp
index 2112e6b14..e0a533d88 100644
--- a/lib/api/requests/restart.cpp
+++ b/lib/api/requests/restart.cpp
@@ -90,7 +90,7 @@ public:
 
 				fclose(configFile);
 			}
-			elif (json_config != nullptr)
+			else if (json_config != nullptr)
 				throw BadRequest("Parameter 'config' must be either a URL (string) or a configuration (object)");
 		}
 		else	/* If no config is provided via request, we will use the previous one */