diff --git a/Source/Core/Core/State.cpp b/Source/Core/Core/State.cpp
index 8d05d01fbc..77f4b93937 100644
--- a/Source/Core/Core/State.cpp
+++ b/Source/Core/Core/State.cpp
@@ -63,7 +63,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
 static std::thread g_save_thread;
 
 // Don't forget to increase this after doing changes on the savestate system
-static const u32 STATE_VERSION = 35;
+static const u32 STATE_VERSION = 36;
 
 enum
 {
diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp
index d797b9158e..6dfc61f9c5 100644
--- a/Source/Core/VideoBackends/Software/Rasterizer.cpp
+++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp
@@ -533,7 +533,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 					// Build the new raster block every other pixel
 					BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1));
 
-					Draw(x, y, x & 1, y & 1);
+					Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
 
 					if (y >= BoundingBox::coords[BoundingBox::TOP])
 						break;
@@ -560,9 +560,9 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 			if (x >= BoundingBox::coords[BoundingBox::LEFT])
 				break;
 
-			s32 CY1 = CX1;
-			s32 CY2 = CX2;
-			s32 CY3 = CX3;
+			CY1 = CX1;
+			CY2 = CX2;
+			CY3 = CX3;
 
 			for (s32 y = miny; y <= maxy; ++y)
 			{
@@ -571,7 +571,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 					// Build the new raster block every other pixel
 					BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1));
 
-					Draw(x, y, x & 1, y & 1);
+					Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
 
 					if (x >= BoundingBox::coords[BoundingBox::LEFT])
 						break;
@@ -595,9 +595,9 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 		// Loop
 		for (s32 y = maxy; y >= miny; --y)
 		{
-			s32 CX1 = CY1;
-			s32 CX2 = CY2;
-			s32 CX3 = CY3;
+			CX1 = CY1;
+			CX2 = CY2;
+			CX3 = CY3;
 
 			if (y <= BoundingBox::coords[BoundingBox::BOTTOM])
 				break;
@@ -609,7 +609,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 					// Build the new raster block every other pixel
 					BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1));
 
-					Draw(x, y, x & 1, y & 1);
+					Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
 
 					if (y <= BoundingBox::coords[BoundingBox::BOTTOM])
 						break;
@@ -636,9 +636,9 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 			if (x <= BoundingBox::coords[BoundingBox::RIGHT])
 				break;
 
-			s32 CY1 = CX1;
-			s32 CY2 = CX2;
-			s32 CY3 = CX3;
+			CY1 = CX1;
+			CY2 = CX2;
+			CY3 = CX3;
 
 			for (s32 y = maxy; y >= miny; --y)
 			{
@@ -647,7 +647,7 @@ void DrawTriangleFrontFace(OutputVertexData *v0, OutputVertexData *v1, OutputVer
 					// Build the new raster block every other pixel
 					BuildBlock((x & ~(BLOCK_SIZE - 1)), y & ~(BLOCK_SIZE - 1));
 
-					Draw(x, y, x & 1, y & 1);
+					Draw(x, y, x & (BLOCK_SIZE - 1), y & (BLOCK_SIZE - 1));
 
 					if (x <= BoundingBox::coords[BoundingBox::RIGHT])
 						break;
diff --git a/Source/Core/VideoCommon/BoundingBox.cpp b/Source/Core/VideoCommon/BoundingBox.cpp
index b76db60dab..c919dfe161 100644
--- a/Source/Core/VideoCommon/BoundingBox.cpp
+++ b/Source/Core/VideoCommon/BoundingBox.cpp
@@ -93,8 +93,6 @@ void LOADERDECL Update()
 	if (g_VtxDesc.Normal != NOT_PRESENT)
 	{
 		// Feed normal input data and transform
-		myVat.g0.NormalIndex3;
-
 		memcpy((u8 *)myVertex.normal, bufferPos + vertexDecl.normals[0].offset, sizeof(float) * 3 * ((myVat.g0.NormalElements) ? 3 : 1));
 
 		TransformUnit::TransformNormal(&myVertex, myVat.g0.NormalElements, outVertex);
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 000a95dd71..ff5ee72dcb 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -1,4 +1,5 @@
-set(SRCS	BPFunctions.cpp
+set(SRCS	BoundingBox.cpp
+			BPFunctions.cpp
 			BPMemory.cpp
 			BPStructs.cpp
 			CPMemory.cpp