diff --git a/Compiler/Compiler.cs b/Compiler/Compiler.cs
index 5b276c40b..171347285 100644
--- a/Compiler/Compiler.cs
+++ b/Compiler/Compiler.cs
@@ -2193,7 +2193,7 @@ namespace PascalABCCompiler
                                 string pdb_file_name=Path.ChangeExtension(CompilerOptions.OutputFileName, ".pdb");
                                 if (File.Exists(pdb_file_name))
                                     File.Delete(pdb_file_name);
-                                    n = 5;
+                                n = 5; // PVS 01/2022
                             }
                             catch (Exception e)
                             {
diff --git a/Compiler/RemoteCompiler.cs b/Compiler/RemoteCompiler.cs
index 90d150787..e8bf14b00 100644
--- a/Compiler/RemoteCompiler.cs
+++ b/Compiler/RemoteCompiler.cs
@@ -85,7 +85,7 @@ namespace PascalABCCompiler
         string inputId = "pabcnetc_input";
         string pabcnetcFileName = "pabcnetc.exe";
         public const int sendCommandStartNumber = 100;
-        public CompilerState compilerState = CompilerState.Reloading;
+        public volatile CompilerState compilerState = CompilerState.Reloading; // PVS 01/2022 volatile
         Encoding inputEncoding = System.Text.Encoding.UTF8;
         bool compilationSatarted = false;
 
diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index bf3e6551a..812c6ffbd 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "8";
 	public const string Build = "2";
-	public const string Revision = "3063";
+	public const string Revision = "3065";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
diff --git a/Configuration/Version.defs b/Configuration/Version.defs
index fd9c87dce..4323519bb 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
 %MINOR%=8
-%REVISION%=3063
+%REVISION%=3065
 %COREVERSION%=2
 %MAJOR%=3
diff --git a/NETGenerator/NETGenerator.cs b/NETGenerator/NETGenerator.cs
index fe16faa7e..3c1b60153 100644
--- a/NETGenerator/NETGenerator.cs
+++ b/NETGenerator/NETGenerator.cs
@@ -8561,7 +8561,11 @@ namespace PascalABCCompiler.NETGenerator
             }
             //ICompiledTypeNode ctn = from.type as ICompiledTypeNode;
             ICompiledTypeNode ctn2 = to.type as ICompiledTypeNode;
-            if ((from.type.is_value_type || from.type.is_generic_parameter) && ctn2 != null && (ctn2.compiled_type == TypeFactory.ObjectType || (ctn2.compiled_type == TypeFactory.ObjectType || ctn2.compiled_type.IsInterface)))
+            if ((from.type.is_value_type || from.type.is_generic_parameter) && 
+                ctn2 != null && 
+                (ctn2.compiled_type == TypeFactory.ObjectType || 
+                (ctn2.compiled_type == TypeFactory.ObjectType || ctn2.compiled_type.IsInterface))
+               )
             {
                 il.Emit(OpCodes.Box, helper.GetTypeReference(from.type).tp);
             }
diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt
index dbbce4d16..4a17b09c6 100644
--- a/Release/pabcversion.txt
+++ b/Release/pabcversion.txt
@@ -1 +1 @@
-3.8.2.3063
+3.8.2.3065
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 0146df0ab..d8108e0f2 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.8.2.3063'
+!define VERSION '3.8.2.3065'
diff --git a/TreeConverter/SymbolTable/DSST/SymbolTable.cs b/TreeConverter/SymbolTable/DSST/SymbolTable.cs
index 22b7bcf04..4fb930142 100644
--- a/TreeConverter/SymbolTable/DSST/SymbolTable.cs
+++ b/TreeConverter/SymbolTable/DSST/SymbolTable.cs
@@ -867,9 +867,9 @@ namespace SymbolTable
         private Scope FindClassScope(Scope scope)
         {
             while (scope != null && !(scope is ClassScope))
-                if(scope is ClassMethodScope)
+                /*if(scope is ClassMethodScope)
                     scope = scope.TopScope;
-                else
+                else*/ // PVS 01/2022
                     scope = scope.TopScope;
             return scope;
         }
diff --git a/TreeConverter/TreeRealization/generics.cs b/TreeConverter/TreeRealization/generics.cs
index 6d5793b77..d28596391 100644
--- a/TreeConverter/TreeRealization/generics.cs
+++ b/TreeConverter/TreeRealization/generics.cs
@@ -427,7 +427,7 @@ namespace PascalABCCompiler.TreeRealization
                     }
                     catch(Exception e)
                     {
-                        e = e;
+                        // e = e; // PVS 01/2022
                     }
                 }
                 else
diff --git a/VisualPlugins/SemanticTreeVisualisator/Source/Visitor.cs b/VisualPlugins/SemanticTreeVisualisator/Source/Visitor.cs
index 941eb8d3a..8a3dfff9f 100644
--- a/VisualPlugins/SemanticTreeVisualisator/Source/Visitor.cs
+++ b/VisualPlugins/SemanticTreeVisualisator/Source/Visitor.cs
@@ -595,10 +595,10 @@ namespace VisualPascalABCPlugins
 
                     tn.Text = collection_name + "   Count : " + num.ToString();
                     tn.Tag = icol;
-                    if (t != null)
+                    /*if (t != null)
                         t.Nodes.Add(tn);
-                    else
-                        nodes.Add(tn);
+                    else*/ // PVS 01/2022
+                    nodes.Add(tn);
                     foreach (ISemanticNode sn in icol)
                     {
                         prepare_node_in_collection(sn, item_name + "[" + i.ToString() + "]", tn);