diff --git a/source/Irrlicht/CAnimatedMeshMD3.cpp b/source/Irrlicht/CAnimatedMeshMD3.cpp
index 0d3a091b..329500cb 100644
--- a/source/Irrlicht/CAnimatedMeshMD3.cpp
+++ b/source/Irrlicht/CAnimatedMeshMD3.cpp
@@ -211,7 +211,7 @@ IMesh* CAnimatedMeshMD3::getMesh(s32 frame, s32 detailLevel, s32 startFrameLoop,
 
 //! create a Irrlicht MeshBuffer for a MD3 MeshBuffer
 IMeshBuffer * CAnimatedMeshMD3::createMeshBuffer(const SMD3MeshBuffer* source,
-							 io::IFileSystem* fs, video::IVideoDriver * driver)
+							 const io::IFileSystem* fs, video::IVideoDriver * driver)
 {
 	SMeshBufferLightMap * dest = new SMeshBufferLightMap();
 	dest->Vertices.set_used(source->MeshHeader.numVertices);
diff --git a/source/Irrlicht/CAnimatedMeshMD3.h b/source/Irrlicht/CAnimatedMeshMD3.h
index c3f2f925..bea2ea98 100644
--- a/source/Irrlicht/CAnimatedMeshMD3.h
+++ b/source/Irrlicht/CAnimatedMeshMD3.h
@@ -117,7 +117,7 @@ namespace scene
 		SMD3QuaternionTagList TagListIPol;
 
 		IMeshBuffer* createMeshBuffer(const SMD3MeshBuffer* source,
-				io::IFileSystem* fs, video::IVideoDriver* driver);
+				const io::IFileSystem* fs, video::IVideoDriver* driver);
 
 		void buildVertexArray(u32 frameA, u32 frameB, f32 interpolate,
 					const SMD3MeshBuffer* source,
diff --git a/source/Irrlicht/CB3DMeshWriter.cpp b/source/Irrlicht/CB3DMeshWriter.cpp
index a7a17b59..92c297aa 100644
--- a/source/Irrlicht/CB3DMeshWriter.cpp
+++ b/source/Irrlicht/CB3DMeshWriter.cpp
@@ -498,7 +498,7 @@ core::array<ISkinnedMesh::SJoint*> CB3DMeshWriter::getRootJoints(const ISkinnedM
     return roots;
 }
 
-u32 CB3DMeshWriter::getUVlayerCount(IMesh* mesh)
+u32 CB3DMeshWriter::getUVlayerCount(const IMesh* mesh)
 {
     const u32 numBeshBuffers = mesh->getMeshBufferCount();
     for (u32 i = 0; i < numBeshBuffers; i++)
diff --git a/source/Irrlicht/CB3DMeshWriter.h b/source/Irrlicht/CB3DMeshWriter.h
index 12c7324f..48fe5395 100644
--- a/source/Irrlicht/CB3DMeshWriter.h
+++ b/source/Irrlicht/CB3DMeshWriter.h
@@ -37,7 +37,7 @@ private:
     u32 getJointChunkSize(const ISkinnedMesh* mesh, ISkinnedMesh::SJoint* joint);
     core::array<ISkinnedMesh::SJoint*> getRootJoints(const ISkinnedMesh* mesh);
 
-    u32 getUVlayerCount(IMesh *mesh);
+    u32 getUVlayerCount(const IMesh *mesh);
     ISkinnedMesh* getSkinned (IMesh *mesh);
 
     inline void writeVector2(io::IWriteFile* file, const core::vector2df& vec);
diff --git a/source/Irrlicht/Irrlicht.ruleset b/source/Irrlicht/Irrlicht.ruleset
index 8766033d..10618656 100644
--- a/source/Irrlicht/Irrlicht.ruleset
+++ b/source/Irrlicht/Irrlicht.ruleset
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Rules for Irrlicht" Description="Code analysis rules for Irrlicht15.0.vcxproj." ToolsVersion="15.0">
+<RuleSet Name="Rules for Irrlicht" Description="Code analysis rules for Irrlicht15.0.vcxproj." ToolsVersion="17.0">
   <IncludeAll Action="Warning" />
   <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
     <Rule Id="CA1000" Action="None" />
@@ -273,6 +273,7 @@
     <Rule Id="C26495" Action="None" />
     <Rule Id="C26496" Action="Warning" />
     <Rule Id="C26497" Action="None" />
+    <Rule Id="C26814" Action="None" />
     <Rule Id="C28204" Action="None" />
     <Rule Id="C28205" Action="None" />
     <Rule Id="C28209" Action="None" />