diff --git a/uppsrc/Core/Range.h b/uppsrc/Core/Range.h
index c9be231d8..3f308b1b9 100644
--- a/uppsrc/Core/Range.h
+++ b/uppsrc/Core/Range.h
@@ -1,16 +1,3 @@
-#ifdef COMPILER_MSC
-
-template <class Range>
-using ValueTypeOf = typename std::remove_reference<decltype(*std::remove_reference<Range>::type().begin())>::type;
-
-template <class Range>
-using IteratorOf = decltype(((typename std::remove_reference<Range>::type *)0)->begin());
-
-template <class Range>
-using ConstIteratorOf = decltype(((const typename std::remove_reference<Range>::type *)0)->begin());
-
-#else
-
 template <class Range>
 using ValueTypeOf = typename std::remove_reference<decltype(*((typename std::remove_reference<Range>::type *)0)->begin())>::type;
 
@@ -20,8 +7,6 @@ using IteratorOf = decltype(((typename std::remove_reference<Range>::type *)0)->
 template <class Range>
 using ConstIteratorOf = decltype(((const typename std::remove_reference<Range>::type *)0)->begin());
 
-#endif
-
 template <class I>
 class SubRangeClass {
 	I   l;
diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp
index 459a90bbd..e2cefcad3 100644
--- a/uppsrc/ide/InstantSetup.cpp
+++ b/uppsrc/ide/InstantSetup.cpp
@@ -341,8 +341,8 @@ void InstantSetup()
 			bmSet(bm, "RELEASE_FLAGS", "");
 			bmSet(bm, "RELEASE_LINK", "-Wl,--stack,20000000");
 			bmSet(bm, "DEBUGGER", "gdb");
-			bmSet(bm, "ALLOW_PRECOMPILED_HEADERS", "1");
-			bmSet(bm, "DISABLE_BLITZ", "1");
+			bmSet(bm, "ALLOW_PRECOMPILED_HEADERS", "");
+			bmSet(bm, "DISABLE_BLITZ", "");
 			
 	//		bmSet(bm, "LINKMODE_LOCK", "0");