diff --git a/desmume/src/lua-engine.h b/desmume/src/lua-engine.h
index d9db3b4ae..e2594279a 100644
--- a/desmume/src/lua-engine.h
+++ b/desmume/src/lua-engine.h
@@ -139,8 +139,8 @@ struct TieredRegion
 
 		bool Contains(unsigned int address, int size) const
 		{
-			std::vector<Island>::const_iterator iter = islands.begin();
-			std::vector<Island>::const_iterator end = islands.end();
+			typename std::vector<Island>::const_iterator iter = islands.begin();
+			typename std::vector<Island>::const_iterator end = islands.end();
 			for(; iter != end; ++iter)
 				if(iter->Contains(address, size))
 					return true;
@@ -163,7 +163,8 @@ struct TieredRegion
 
 	TieredRegion()
 	{
-		Calculate(std::vector<unsigned int>());
+		std::vector<unsigned int> somevector;
+		Calculate(somevector);
 	}
 
 	FORCEINLINE int NotEmpty()