diff --git a/Aquaria/Continuity.cpp b/Aquaria/Continuity.cpp
index cc88b79..d9c978b 100644
--- a/Aquaria/Continuity.cpp
+++ b/Aquaria/Continuity.cpp
@@ -2543,6 +2543,7 @@ void Continuity::loadFile(int slot)
 {
 	dsq->user.save();
 	this->reset();
+	knowsSong.clear(); // Adds shield song by default, which interferes with mods that don't start with it
 
 	TiXmlDocument doc;
 	loadFileData(slot, doc);
diff --git a/Aquaria/ScriptInterface.cpp b/Aquaria/ScriptInterface.cpp
index dde0278..974ffe5 100644
--- a/Aquaria/ScriptInterface.cpp
+++ b/Aquaria/ScriptInterface.cpp
@@ -988,6 +988,14 @@ luaFunc(obj_setTexture)
 	luaReturnNil();
 }
 
+luaFunc(obj_getTexture)
+{
+    RenderObject *r = robj(L);
+    if (r && r->texture)
+        luaReturnStr(r->texture->name.c_str());
+    luaReturnStr("");
+}
+
 luaFunc(obj_delete)
 {
 	RenderObject *r = robj(L);
@@ -1490,6 +1498,7 @@ luaFunc(quad_setHeight)
 	RO_FUNC(getter, prefix,  internalOffset	) \
 	RO_FUNC(getter, prefix,  getInternalOffset) \
 	RO_FUNC(getter, prefix,  getPosition	) \
+	RO_FUNC(getter, prefix,  getTexture		) \
 	RO_FUNC(getter, prefix,  x				) \
 	RO_FUNC(getter, prefix,  y				) \
 	RO_FUNC(getter, prefix,  setBlendType	) \
diff --git a/ExternalLibs/glfont2/glfont2.cpp b/ExternalLibs/glfont2/glfont2.cpp
index 3126bed..56b5abe 100644
--- a/ExternalLibs/glfont2/glfont2.cpp
+++ b/ExternalLibs/glfont2/glfont2.cpp
@@ -89,7 +89,7 @@ bool GLFont::Create (const char *file_name, int tex, bool loadTexture)
 		return false;
 
 	//Read character array
-	for (int i = 0; i < num_chars; i++)
+	for (unsigned int i = 0; i < num_chars; i++)
 	{
 		bb >> header.chars[i].dx;
 		bb >> header.chars[i].dy;