diff --git a/hecl/blender/BlenderConnection.cpp b/hecl/blender/BlenderConnection.cpp
index 96979fa8f..b5fc50c60 100644
--- a/hecl/blender/BlenderConnection.cpp
+++ b/hecl/blender/BlenderConnection.cpp
@@ -380,8 +380,6 @@ bool BlenderConnection::openBlend(const ProjectPath& path)
                           "BlenderConnection::openBlend() musn't be called with stream active");
         return false;
     }
-    if (path == m_loadedBlend)
-        return true;
     _writeLine(("OPEN \"" + path.getAbsolutePathUTF8() + "\"").c_str());
     char lineBuf[256];
     _readLine(lineBuf, sizeof(lineBuf));
diff --git a/hecl/include/HECL/Frontend.hpp b/hecl/include/HECL/Frontend.hpp
index 8ff60b623..c601efb67 100644
--- a/hecl/include/HECL/Frontend.hpp
+++ b/hecl/include/HECL/Frontend.hpp
@@ -164,7 +164,7 @@ struct IR
 
         Instruction(OpType type, const SourceLocation& loc) : m_op(type), m_loc(loc) {}
 
-        ssize_t getChildCount() const
+        int getChildCount() const
         {
             switch (m_op)
             {
diff --git a/hecl/include/HECL/HECL.hpp b/hecl/include/HECL/HECL.hpp
index 20e051485..d12ca3b68 100644
--- a/hecl/include/HECL/HECL.hpp
+++ b/hecl/include/HECL/HECL.hpp
@@ -604,6 +604,10 @@ public:
             pp.m_relPath += ext;
             pp.m_absPath += ext;
         }
+#if HECL_UCS2
+        pp.m_utf8AbsPath = WideToUTF8(pp.m_absPath);
+        pp.m_utf8RelPath = WideToUTF8(pp.m_relPath);
+#endif
         return pp;
     }
 
diff --git a/hecl/lib/Backend/GX.cpp b/hecl/lib/Backend/GX.cpp
index ea9712259..0fc69fdb3 100644
--- a/hecl/lib/Backend/GX.cpp
+++ b/hecl/lib/Backend/GX.cpp
@@ -94,7 +94,7 @@ unsigned GX::RecursiveTraceTexGen(const IR& ir, Diagnostics& diag, const IR::Ins
     ++m_texMtxCount;
     tcg.m_gameFunction = tcgName;
     tcg.m_gameArgs.clear();
-    for (ssize_t i=1 ; i<inst.getChildCount() ; ++i)
+    for (int i=1 ; i<inst.getChildCount() ; ++i)
     {
         const IR::Instruction& ci = inst.getChildInst(ir, i);
         tcg.m_gameArgs.push_back(ci.getImmVec());
@@ -361,7 +361,7 @@ GX::TraceResult GX::RecursiveTraceAlpha(const IR& ir, Diagnostics& diag, const I
             unsigned mapIdx = unsigned(mapImm.vec[0]);
 
             int foundStage = -1;
-            for (int i=0 ; i<m_tevCount ; ++i)
+            for (int i=0 ; i<int(m_tevCount) ; ++i)
             {
                 TEVStage& testStage = m_tevs[i];
                 if (testStage.m_texMapIdx == mapIdx && i > m_alphaTraceStage)
@@ -657,7 +657,7 @@ void GX::reset(const IR& ir, Diagnostics& diag)
 
         /* Ensure Alpha reaches end of chain */
         if (m_alphaTraceStage >= 0)
-            for (int i=m_alphaTraceStage+1 ; i<m_tevCount ; ++i)
+            for (unsigned i=m_alphaTraceStage+1 ; i<m_tevCount ; ++i)
                 m_tevs[i].m_alpha[3] = CA_APREV;
     }