diff --git a/Unreal/Environments/Blocks/Blocks.uproject b/Unreal/Environments/Blocks/Blocks.uproject
index 9f60cef8fe..4dc1bb3681 100644
--- a/Unreal/Environments/Blocks/Blocks.uproject
+++ b/Unreal/Environments/Blocks/Blocks.uproject
@@ -17,6 +17,14 @@
 		{
 			"Name": "AirSim",
 			"Enabled": true
-		}
+		},
+		{
+            		"Name": "SteamVR",
+		        "Enabled": false
+	        },
+        	{
+		        "Name": "OculusVR",
+		        "Enabled": false
+	        },
 	]
 }
diff --git a/Unreal/Environments/Blocks/Source/Blocks.Target.4.15.cs b/Unreal/Environments/Blocks/Source/Blocks.Target.4.15.cs
deleted file mode 100644
index 3d56c3966b..0000000000
--- a/Unreal/Environments/Blocks/Source/Blocks.Target.4.15.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
-
-using UnrealBuildTool;
-using System.Collections.Generic;
-
-public class BlocksTarget : TargetRules
-{
-	public BlocksTarget(TargetInfo Target)
-	{
-		Type = TargetType.Game;
-	}
-
-	//
-	// TargetRules interface.
-	//
-
-	public override void SetupBinaries(
-		TargetInfo Target,
-		ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
-		ref List<string> OutExtraModuleNames
-		)
-	{
-		OutExtraModuleNames.Add("Blocks");
-	}
-}
diff --git a/Unreal/Environments/Blocks/Source/Blocks/Blocks.Build.4.15.cs b/Unreal/Environments/Blocks/Source/Blocks/Blocks.Build.4.15.cs
deleted file mode 100644
index 5852ecc55c..0000000000
--- a/Unreal/Environments/Blocks/Source/Blocks/Blocks.Build.4.15.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
-
-using UnrealBuildTool;
-
-public class Blocks : ModuleRules
-{
-	public Blocks(TargetInfo Target)
-	{
-		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" });
-	}
-}
diff --git a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.4.15.cs b/Unreal/Environments/Blocks/Source/BlocksEditor.Target.4.15.cs
deleted file mode 100644
index 184e12de93..0000000000
--- a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.4.15.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
-
-using UnrealBuildTool;
-using System.Collections.Generic;
-
-public class BlocksEditorTarget : TargetRules
-{
-	public BlocksEditorTarget(TargetInfo Target)
-	{
-		Type = TargetType.Editor;
-	}
-
-	//
-	// TargetRules interface.
-	//
-
-	public override void SetupBinaries(
-		TargetInfo Target,
-		ref List<UEBuildBinaryConfiguration> OutBuildBinaryConfigurations,
-		ref List<string> OutExtraModuleNames
-		)
-	{
-		OutExtraModuleNames.Add("Blocks");
-	}
-}
diff --git a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs b/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs
index 4ec09ba183..187daed546 100644
--- a/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs
+++ b/Unreal/Environments/Blocks/Source/BlocksEditor.Target.cs
@@ -9,7 +9,7 @@ public BlocksEditorTarget(TargetInfo Target) : base(Target)
 	{
 		Type = TargetType.Editor;
 		ExtraModuleNames.AddRange(new string[] { "Blocks" });
-
+        DefaultBuildSettings = BuildSettingsVersion.V2;
         //bUseUnityBuild = false;
         //bUsePCHFiles = false;
     }
diff --git a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp
index 2e23d0018c..e1f62ce1f3 100644
--- a/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp
+++ b/Unreal/Plugins/AirSim/Source/AirBlueprintLib.cpp
@@ -21,6 +21,7 @@
 #include "Engine/Engine.h"
 #include <exception>
 #include "common/common_utils/Utils.hpp"
+#include "Modules/ModuleManager.h"
 
 /*
 //TODO: change naming conventions to same as other files?
diff --git a/cmake/cmake-modules/CommonSetup.cmake b/cmake/cmake-modules/CommonSetup.cmake
index bae440fb44..bca7a8f9b6 100644
--- a/cmake/cmake-modules/CommonSetup.cmake
+++ b/cmake/cmake-modules/CommonSetup.cmake
@@ -53,10 +53,8 @@ macro(CommonSetup)
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wstrict-aliasing -D__CLANG__")
         else ()
             set(CMAKE_CXX_FLAGS "\
-                -std=c++17 -ggdb -Wall -Wextra -Wstrict-aliasing -Wunreachable-code -Wcast-qual -Wctor-dtor-privacy \
-                -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-include-dirs -Wswitch-default \
-                -Wold-style-cast -Woverloaded-virtual -Wredundant-decls -Wshadow -Wstrict-overflow=5 -Wswitch-default -Wundef \
-                -Wno-variadic-macros -Wno-parentheses -Wno-unused-function -Wno-unused -fdiagnostics-show-option \
+                -std=c++17 -ggdb -Wall -Wextra \
+                -Wno-variadic-macros -Wno-parentheses -Wno-unused-function -Wno-unused \
                 -pthread \
                 ${RPC_LIB_DEFINES} ${CMAKE_CXX_FLAGS}")