diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
index 8f6a4e03c6..f874a041f1 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
@@ -267,15 +267,15 @@ bool Renderer::Init()
 	s_backbuffer_height = D3D::GetBackBufferHeight();
 
 	// TODO: Grab target width from configured resolution?
-	s_target_width  = s_backbuffer_width * EFB_WIDTH / 640;
-	s_target_height = s_backbuffer_height * EFB_HEIGHT / 480;	
+	s_target_width  = s_backbuffer_width;
+	s_target_height = s_backbuffer_height * ((float)EFB_HEIGHT / 480.0f);	
 
 	xScale = (float)s_target_width / (float)EFB_WIDTH;
 	yScale = (float)s_target_height / (float)EFB_HEIGHT;
-	s_Fulltarget_width  = s_backbuffer_width;
-	s_Fulltarget_height = s_backbuffer_height;
+	s_Fulltarget_width  = s_target_width;
+	s_Fulltarget_height = s_target_height;
 	//apply automatic resizing only is not an ati card, ati can handle large viewports :)
-	AUTO_ADJUST_RENDERTARGET_SIZE  = true;//!D3D::IsATIDevice();
+	AUTO_ADJUST_RENDERTARGET_SIZE  = !D3D::IsATIDevice();
 	
 	s_LastFrameDumped = false;
 	s_AVIDumping = false;
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
index e7e1a1b2fb..3dc5570c0d 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
@@ -243,7 +243,7 @@ void Flush()
 	for (int i = 0; i < 8; i++)
 	{
 		if (usedtextures & (1 << i)) {
-			//Renderer::SetSamplerState(i & 3, i >> 2);
+			Renderer::SetSamplerState(i & 3, i >> 2);
 			FourTexUnits &tex = bpmem.tex[i >> 2];
 			TextureCache::TCacheEntry* tentry = TextureCache::Load(i, 
 				(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,