diff --git a/apps/esmtool/labels.cpp b/apps/esmtool/labels.cpp
index 7a42e6900..ef45989ef 100644
--- a/apps/esmtool/labels.cpp
+++ b/apps/esmtool/labels.cpp
@@ -387,7 +387,7 @@ std::string magicEffectLabel(int idx)
         "sEffectSummonCreature04",
         "sEffectSummonCreature05"
     };
-    if (idx >= 0 && idx <= 143)
+    if (idx >= 0 && idx <= 142)
         return magicEffectLabels[idx];
     else
         return "Invalid";
@@ -471,7 +471,7 @@ std::string skillLabel(int idx)
         "Speechcraft",
         "Hand-to-hand"
     };
-    if (idx >= 0 && idx <= 27)
+    if (idx >= 0 && idx <= 26)
         return skillLabels[idx];
     else
         return "Invalid";
@@ -498,7 +498,7 @@ std::string rangeTypeLabel(int idx)
         "Touch",
         "Target"
     };
-    if (idx >= 0 && idx <= 3)
+    if (idx >= 0 && idx <= 2)
         return rangeTypeLabels[idx];
     else
         return "Invalid";
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index 90a294c0c..ed628278b 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -98,7 +98,7 @@ namespace Compiler
         else if (t1=='f' || t2=='f')
             mOperands.push_back ('f');
         else
-            std::logic_error ("failed to determine result operand type");
+            throw std::logic_error ("failed to determine result operand type");
     }
 
     void ExprParser::pop()
diff --git a/extern/shiny/Main/Factory.hpp b/extern/shiny/Main/Factory.hpp
index 15c859958..e8562011c 100644
--- a/extern/shiny/Main/Factory.hpp
+++ b/extern/shiny/Main/Factory.hpp
@@ -206,7 +206,7 @@ namespace sh
 
 		std::string getCacheFolder () { return mPlatform->getCacheFolder (); }
 		bool getReadSourceCache() { return mReadSourceCache; }
-		bool getWriteSourceCache() { return mReadSourceCache; }
+		bool getWriteSourceCache() { return mWriteSourceCache; }
 	public:
 		bool getWriteMicrocodeCache() { return mWriteMicrocodeCache; } // Fixme