diff --git a/CMakeLists.txt b/CMakeLists.txt
index b99f97ca88c411dc1cdb3ab094163581fabdaba5..7d311e83f2f4f96da836cc88463ee6eb66ab70a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ project(cta)
 set(CMAKE_C_FLAGS "-fPIC -pedantic -Wall -Wextra -Werror -Wno-unused-parameter")
 set(CMAKE_CXX_FLAGS "-fPIC -pedantic -Wall -Wextra -Werror -Wno-unused-parameter -Wno-long-long")
 
+
 # Explicitly setting the C and C++ compiler flags for the RelWithDebInfo build
 # in order to prevent the -O2 flag from being used.
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g")
diff --git a/libs/client/TestingMockClientAPI.hpp b/libs/client/TestingMockClientAPI.hpp
new file mode 100644
index 0000000000000000000000000000000000000000..5191308f5fde38a887e20f68cd4acb3e6511fd14
--- /dev/null
+++ b/libs/client/TestingMockClientAPI.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "MockClientAPI.hpp"
+
+namespace cta {
+
+class TestingMockClientAPI: public MockClientAPI {
+public:
+
+  using MockClientAPI::getEnclosingDirPath;
+
+}; // class TestingMockClientAPI
+
+} // namespace cta
+
diff --git a/xroot_plugins/XrdProFilesystem.cpp b/xroot_plugins/XrdProFilesystem.cpp
index c183236aefb0649104dfba4c60fbced15518ea6c..1d54b9e22ea6a005d4113be04634673587c2ee89 100644
--- a/xroot_plugins/XrdProFilesystem.cpp
+++ b/xroot_plugins/XrdProFilesystem.cpp
@@ -10,7 +10,7 @@
 #include <sstream>
 #include <sys/types.h>
 
-XrdVERSIONINFO(XrdSfsGetFileSystem,XrdPro);
+XrdVERSIONINFO(XrdSfsGetFileSystem,XrdPro)
 
 extern "C"
 {
@@ -33,13 +33,13 @@ int XrdProFilesystem::checkClient(const XrdSecEntity *client, XrdOucErrInfo &eIn
   struct passwd pwd;
   struct passwd *result;
   char *buf;
-  size_t bufsize;
+  long bufsize;
   bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
   if (bufsize == -1)
   {
     bufsize = 16384;
   }
-  buf = (char *)malloc(bufsize);
+  buf = (char *)malloc((size_t)bufsize);
   if(buf == NULL)
   {
     std::string response = "[ERROR] malloc of the buffer failed";
@@ -103,7 +103,7 @@ int XrdProFilesystem::executeArchiveCommand(ParsedRequest &req, XrdOucErrInfo &e
   try {
     std::list<std::string> sourceFiles;
     std::string destinationPath = req.args.at(req.args.size()-1);
-    for(int i=0; i<req.args.size()-1; i++) {
+    for(size_t i=0; i<req.args.size()-1; i++) {
       sourceFiles.push_back(req.args.at(i));
     }
     cta::UserIdentity requester;