diff --git a/dyn/configvm.h b/dyn/configvm.h
index b6261b041..b6238b1bd 100644
--- a/dyn/configvm.h
+++ b/dyn/configvm.h
@@ -23,7 +23,7 @@
 namespace icinga
 {
 
-class ConfigVM
+class I2_DYN_API ConfigVM
 {
 public:
 	static void ExecuteItems(const vector<ConfigItem::Ptr>& items);
diff --git a/dyn/dyn.vcxproj b/dyn/dyn.vcxproj
index 010bdee5a..02b532612 100644
--- a/dyn/dyn.vcxproj
+++ b/dyn/dyn.vcxproj
@@ -11,20 +11,27 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="configcontext.h" />
+    <ClInclude Include="configcompiler.h" />
+    <ClInclude Include="configitem.h" />
+    <ClInclude Include="configvm.h" />
     <ClInclude Include="config_parser.h" />
-    <ClInclude Include="dynamicdictionary.h" />
+    <ClInclude Include="debuginfo.h" />
     <ClInclude Include="dynamicobject.h" />
+    <ClInclude Include="expression.h" />
+    <ClInclude Include="expressionlist.h" />
     <ClInclude Include="i2-dyn.h" />
     <ClInclude Include="objectmap.h" />
     <ClInclude Include="objectset.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="configcontext.cpp" />
+    <ClCompile Include="configcompiler.cpp" />
+    <ClCompile Include="configitem.cpp" />
+    <ClCompile Include="configvm.cpp" />
     <ClCompile Include="config_lexer.cc" />
     <ClCompile Include="config_parser.cc" />
-    <ClCompile Include="dynamicdictionary.cpp" />
     <ClCompile Include="dynamicobject.cpp" />
+    <ClCompile Include="expression.cpp" />
+    <ClCompile Include="expressionlist.cpp" />
     <ClCompile Include="objectmap.cpp" />
     <ClCompile Include="objectset.cpp" />
   </ItemGroup>
diff --git a/dyn/dynamicobject.cpp b/dyn/dynamicobject.cpp
index cc877ac3c..542b23b92 100644
--- a/dyn/dynamicobject.cpp
+++ b/dyn/dynamicobject.cpp
@@ -36,8 +36,11 @@ Dictionary::Ptr DynamicObject::GetConfig(void) const
 	return m_Config;
 }
 
-Dictionary::Ptr DynamicObject::GetTags(void) const
+Dictionary::Ptr DynamicObject::GetTags(void)
 {
+	if (!m_Tags)
+		m_Tags = make_shared<Dictionary>();
+
 	return m_Tags;
 }
 
diff --git a/dyn/dynamicobject.h b/dyn/dynamicobject.h
index 719a9df29..e8d118a35 100644
--- a/dyn/dynamicobject.h
+++ b/dyn/dynamicobject.h
@@ -36,7 +36,7 @@ public:
 	void SetConfig(Dictionary::Ptr config);
 	Dictionary::Ptr GetConfig(void) const;
 
-	Dictionary::Ptr GetTags(void) const;
+	Dictionary::Ptr GetTags(void);
 
 	string GetType(void) const;
 	string GetName(void) const;
diff --git a/dyn/objectset.h b/dyn/objectset.h
index 770b12f0e..af0796a71 100644
--- a/dyn/objectset.h
+++ b/dyn/objectset.h
@@ -124,7 +124,7 @@ public:
 private:
 	set<TValue> m_Objects;
 
-	ObjectSet::Ptr m_Parent;
+	typename ObjectSet<TValue>::Ptr m_Parent;
 	function<bool (const TValue&)> m_Predicate;
 
 	int ObjectAddedOrCommittedHandler(const ObjectSetEventArgs<TValue>& ea)