diff --git a/changes.txt b/changes.txt
index 340288fc..7954dc6b 100644
--- a/changes.txt
+++ b/changes.txt
@@ -183,6 +183,7 @@ GUI:
    You can now type an item's text to select it.
 
 
+-------------------------------------------
 Changes in version 1.3.1 (20 Jun 2007)
 
  - Fixed a bug with negative exponents in fast_atof, posted by RVL
diff --git a/examples/TestProject/main.cpp b/examples/TestProject/main.cpp
index 5414afd7..e9329808 100644
--- a/examples/TestProject/main.cpp
+++ b/examples/TestProject/main.cpp
@@ -83,7 +83,7 @@ int main()
 	
 	if (q3node)
 	{		
-		q3node->setPosition(core::vector3df(-1370,-130,-1400));
+		q3node->setPosition(core::vector3df(-1350,-130,-1400));
 
 		selector = smgr->createOctTreeTriangleSelector(q3levelmesh->getMesh(0), q3node, 128);
 		q3node->setTriangleSelector(selector);
@@ -155,7 +155,7 @@ int main()
 	// add 3 animated faeries.
 
 	video::SMaterial material;
-	material.Texture1 = driver->getTexture("../../media/faerie2.bmp");
+	material.Textures[0] = driver->getTexture("../../media/faerie2.bmp");
 	material.Lighting = true;
 
 	scene::IAnimatedMeshSceneNode* node = 0;
@@ -179,7 +179,7 @@ int main()
 		node->getMaterial(0) = material;
 	}
 
-	material.Texture1 = 0;
+	material.Textures[0] = 0;
 	material.Lighting = false;
 
 	// Add a light
diff --git a/source/Irrlicht/CColladaFileLoader.cpp b/source/Irrlicht/CColladaFileLoader.cpp
index a702ab50..f5f36b28 100644
--- a/source/Irrlicht/CColladaFileLoader.cpp
+++ b/source/Irrlicht/CColladaFileLoader.cpp
@@ -1006,6 +1006,7 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 	core::stringc materialName = reader->getAttributeValue("material");
 	uriToId(materialName);
 	video::SMaterial mat;
+
 	for (u32 i=0; i<Materials.size(); ++i)
 		if (materialName == Materials[i].Id)
 		{
@@ -1125,22 +1126,22 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 
 	// analyze content of slots to create a fitting mesh buffer
 
-	u32 i;
+	u32 u;
 	u32 textureCoordSetCount = 0;
 	bool normalSlotCount = false;
 	u32 secondTexCoordSetIndex = 0xFFFFFFFF;
 
-	for (i=0; i<slots.size(); ++i)
+	for (u=0; u<slots.size(); ++u)
 	{
-		if (slots[i].Semantic == ECIS_TEXCOORD || slots[i].Semantic == ECIS_UV )
+		if (slots[u].Semantic == ECIS_TEXCOORD || slots[u].Semantic == ECIS_UV )
 		{
 			++textureCoordSetCount;
 
 			if (textureCoordSetCount==2)
-				secondTexCoordSetIndex = i;
+				secondTexCoordSetIndex = u;
 		}
 		else
-		if (slots[i].Semantic == ECIS_NORMAL)
+		if (slots[u].Semantic == ECIS_NORMAL)
 			normalSlotCount=true;
 	}
 
@@ -1157,7 +1158,7 @@ void CColladaFileLoader::readPolygonSection(io::IXMLReaderUTF8* reader,
 		mbuffer->Material=mat;
 		buffer = mbuffer;
 
-		for (i=0; i<polygons.size(); ++i)
+		for (u32 i=0; i<polygons.size(); ++i)
 		{
 			u32 vertexCount = polygons[i].Indices.size() / inputSemanticCount;
 
diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp
index f0fb4aca..a7914ccc 100644
--- a/source/Irrlicht/CXMeshFileLoader.cpp
+++ b/source/Irrlicht/CXMeshFileLoader.cpp
@@ -1491,7 +1491,9 @@ bool CXMeshFileLoader::parseDataObjectAnimation()
 #ifdef _DEBUG
 			os::Printer::log("getting name: ", FrameName.c_str());
 #endif
-			for (u32 n=0;n < AnimatedMesh->getAllJoints().size();++n)
+			u32 n;
+
+			for (n=0;n < AnimatedMesh->getAllJoints().size();++n)
 			{
 				if (AnimatedMesh->getAllJoints()[n]->Name==FrameName)
 					joint=AnimatedMesh->getAllJoints()[n];
@@ -1506,8 +1508,6 @@ bool CXMeshFileLoader::parseDataObjectAnimation()
 				joint->Name=FrameName;
 			}
 
-			u32 n;
-
 			for (n=0;n<animationDump.PositionKeys.size();++n)
 			{
 				ISkinnedMesh::SPositionKey *key=&animationDump.PositionKeys[n];