diff --git a/.gitignore b/.gitignore
index 296cd6a..42eb169 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .project
 *.bat
 *.sis
+*.sisx
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
diff --git a/sis/re3.sisx b/sis/re3.sisx
deleted file mode 100644
index a8c27d8..0000000
Binary files a/sis/re3.sisx and /dev/null differ
diff --git a/src/math/math.cpp b/src/math/math.cpp
index 8cb56da..57d6f82 100644
--- a/src/math/math.cpp
+++ b/src/math/math.cpp
@@ -80,7 +80,8 @@ void TransformPoints(CVuVector *out, int n, const CMatrix &mat, const RwV3d *in,
 		": : "r" (out) , "r" (n), "r" (&mat), "r" (in), "r" (stride): "memory");
 #else
 	while(n--){
-		*out = mat * *in;
+		const RwV3d i = *in;
+		*out = mat * i;
 		in = (RwV3d*)((uint8*)in + stride);
 		out++;
 	}
@@ -110,7 +111,8 @@ void TransformPoints(CVuVector *out, int n, const CMatrix &mat, const CVuVector
 		": : "r" (out) , "r" (n), "r" (&mat) ,"r" (in): "memory");
 #else
 	while(n--){
-		*out = mat * *in;
+		const RwV3d i = *in;
+		*out = mat * i;
 		in++;
 		out++;
 	}
diff --git a/vendor/librw/src/gles1/gl1immed.cpp b/vendor/librw/src/gles1/gl1immed.cpp
index b32c1fe..0b11290 100644
--- a/vendor/librw/src/gles1/gl1immed.cpp
+++ b/vendor/librw/src/gles1/gl1immed.cpp
@@ -19,20 +19,6 @@ namespace gles1 {
 
 uint32 im2DVbo, im2DIbo;
 
-static AttribDesc im2dattribDesc[3] = {
-	{ ATTRIB_POS,        GL_FLOAT,         GL_FALSE, 4,
-		sizeof(Im2DVertex), 0 },
-	{ ATTRIB_COLOR,      GL_UNSIGNED_BYTE, GL_TRUE,  4,
-		#ifdef S60V5
-		dcl[i].offset = OFFSET_OF(VertexConstantData, texCoors);
-		#else
-		dcl[i].offset = offsetof(VertexConstantData, texCoors);				
-		#endif
-		
-	{ ATTRIB_TEXCOORDS0, GL_FLOAT,         GL_FALSE, 2,
-		sizeof(Im2DVertex), offsetof(Im2DVertex, u) },
-};
-
 static int primTypeMap[] = {
 	GL_POINTS,	// invalid
 	GL_LINES,