diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp
index 4ecd7173bb..6633805c62 100644
--- a/stepmania/src/RageDisplay_D3D.cpp
+++ b/stepmania/src/RageDisplay_D3D.cpp
@@ -925,7 +925,7 @@ RageMatrix RageDisplay_D3D::GetOrthoMatrix( float l, float r, float b, float t,
 	RageMatrix m(
 		2/(r-l),      0,            0,           0,
 		0,            2/(t-b),      0,           0,
-		0,            0,            1/(zn-zf),   0,
-		-(r+l)/(r-l), -(t+b)/(t-b), zn/(zn-zf),  1 );
+		0,            0,            -1/(zf-zn),  0,
+		-(r+l)/(r-l), -(t+b)/(t-b), -zn/(zf-zn),  1 );
 	return m;
 }
diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index 72e8f5db7a..b8845a73b6 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -394,7 +394,7 @@ static void SetupVertices( const RageVertex v[], int iNumVerts )
 		Texture[i*2+1] = v[i].t[1];
 		Normal[i*3+0] = v[i].n[0];
 		Normal[i*3+1] = v[i].n[1];
-		Normal[i*3+2] = v[i].n[2];
+		Normal[i*+2] = v[i].n[2];
 	}
 	glEnableClientState(GL_VERTEX_ARRAY);
 	glVertexPointer(3, GL_FLOAT, 0, Vertex);
@@ -406,7 +406,7 @@ static void SetupVertices( const RageVertex v[], int iNumVerts )
 	glTexCoordPointer(2, GL_FLOAT, 0, Texture);
 
 	glEnableClientState(GL_NORMAL_ARRAY);
-	glNormalPointer(GL_FLOAT, 0, Normal);
+	glNormalPointer(GL_FLOAT, 0, Texture);
 }
 
 void RageDisplay_OGL::DrawQuads( const RageVertex v[], int iNumVerts )