diff --git a/config/stack_config.h b/config/stack_config.h
index 00ac2bcc..12dfd444 100644
--- a/config/stack_config.h
+++ b/config/stack_config.h
@@ -164,10 +164,10 @@
 #define CONFIG_IEC61850_R_SMV 0
 
 /* compile with support for L2 GOOSE */
-#define CONFIG_IEC61850_L2_GOOSE 0
+#define CONFIG_IEC61850_L2_GOOSE 1
 
 /* compile with support for L2 SMV */
-#define CONFIG_IEC61850_L2_SMV 0
+#define CONFIG_IEC61850_L2_SMV 1
 
 /* compile SNTP client code */
 #define CONFIG_IEC61850_SNTP_CLIENT 0
diff --git a/dotnet/IEC61850forCSharp/IedServerConfig.cs b/dotnet/IEC61850forCSharp/IedServerConfig.cs
index 5eacb1e0..0f17815a 100644
--- a/dotnet/IEC61850forCSharp/IedServerConfig.cs
+++ b/dotnet/IEC61850forCSharp/IedServerConfig.cs
@@ -408,9 +408,9 @@ namespace IEC61850.Server
         /// <note>Can be used to implement some of Services\ReportSettings options</note>
         /// <param name="settings">the settings that should be configured writeable or read-only</param>
         /// <param name="isDyn">true, settings are writeable, false, settings are read-only</param>
-        public void SetReportSetting(ReportSettings settings)
+        public void SetReportSetting(ReportSettings settings, bool isDyn = true)
         {
-            IedServerConfig_setReportSetting(self, (byte)settings, true);
+            IedServerConfig_setReportSetting(self, (byte)settings, isDyn);
         }
 
         /// <summary>
diff --git a/make/stack_includes.mk b/make/stack_includes.mk
index 74031182..41213ff9 100644
--- a/make/stack_includes.mk
+++ b/make/stack_includes.mk
@@ -10,3 +10,4 @@ INCLUDES += -I$(LIBIEC_HOME)/src/goose
 INCLUDES += -I$(LIBIEC_HOME)/src/sampled_values
 INCLUDES += -I$(LIBIEC_HOME)/src/logging
 INCLUDES += -I$(LIBIEC_HOME)/src/tls
+INCLUDES += -I$(LIBIEC_HOME)/src/r_session