diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21eba8db5..f95a5ef55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,7 +81,7 @@ endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
 # Macros
 include(OpenMWMacros)
 
-include(PVS-Studio.cmake)
+include(PVS-Studio)
 
 # doxygen main page
 
diff --git a/PVS-Studio.cmake b/cmake/PVS-Studio.cmake
similarity index 100%
rename from PVS-Studio.cmake
rename to cmake/PVS-Studio.cmake
diff --git a/components/openmw-mp/Packets/BasePacket.hpp b/components/openmw-mp/Packets/BasePacket.hpp
index bcf41b73d..6d2487758 100644
--- a/components/openmw-mp/Packets/BasePacket.hpp
+++ b/components/openmw-mp/Packets/BasePacket.hpp
@@ -17,9 +17,9 @@ namespace mwmp
         virtual ~BasePacket() = default;
 
         virtual void Packet(RakNet::BitStream *bs, bool send);
-        virtual uint32_t Send(bool toOtherPlayers = true);
-        virtual uint32_t Send(RakNet::AddressOrGUID destination);
-        virtual void Read();
+        uint32_t Send(bool toOtherPlayers = true);
+        uint32_t Send(RakNet::AddressOrGUID destination);
+        void Read();
 
         void setGUID(RakNet::RakNetGUID guid);
         RakNet::RakNetGUID getGUID();
@@ -27,7 +27,7 @@ namespace mwmp
         void SetReadStream(RakNet::BitStream *bitStream);
         void SetSendStream(RakNet::BitStream *bitStream);
         void SetStreams(RakNet::BitStream *inStream, RakNet::BitStream *outStream);
-        virtual uint32_t RequestData(RakNet::RakNetGUID guid);
+        uint32_t RequestData(RakNet::RakNetGUID guid);
 
         static inline uint32_t headerSize()
         {