diff --git a/src/mesa/drivers/dri/r600/r600_emit.c b/src/mesa/drivers/dri/r600/r600_emit.c
index be86de1..e2011d9 100644
--- a/src/mesa/drivers/dri/r600/r600_emit.c
+++ b/src/mesa/drivers/dri/r600/r600_emit.c
@@ -73,11 +73,11 @@ shader_again_alloc:
 		rcommonFlushCmdBuf(radeonctx, __FUNCTION__);
 		goto shader_again_alloc;
 	}
-
+#if 0
 	radeon_cs_space_add_persistent_bo(radeonctx->cmdbuf.cs,
 					  pbo,
 					  RADEON_GEM_DOMAIN_GTT, 0);
-
+#endif
         if (radeon_cs_space_check_with_bo(radeonctx->cmdbuf.cs,
                                           pbo,
                                           RADEON_GEM_DOMAIN_GTT, 0)) {
diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c
index cdf3220..62a481d 100644
--- a/src/mesa/drivers/dri/r600/r700_render.c
+++ b/src/mesa/drivers/dri/r600/r700_render.c
@@ -353,6 +353,7 @@ static GLboolean r700RunRender(GLcontext * ctx,
 			 DB_ACTION_ENA_bit | DB_DEST_BASE_ENA_bit);
 
     radeonReleaseArrays(ctx, ~0);
+    radeon_bo_unref((struct radeon_bo *)r700GetActiveVpShaderBo(ctx));
 
     return GL_FALSE;
 }
diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c
index f8f862b..e725f56 100644
--- a/src/mesa/drivers/dri/r600/r700_vertprog.c
+++ b/src/mesa/drivers/dri/r600/r700_vertprog.c
@@ -317,7 +317,7 @@ void r700SelectVertexShader(GLcontext *ctx)
 		}
 	}
 
-	if(GL_FALSE == vpc->translated) {
+	if(1/*GL_FALSE == vpc->translated*/) {
 		r700TranslateVertexShader(vpc, &(vpc->mesa_program) );
 	}
 }
@@ -341,9 +341,9 @@ GLboolean r700SetupVertexProgram(GLcontext * ctx)
     unsigned int unNumParamData;
     unsigned int ui;
 
-    if(GL_FALSE == vp->loaded)
+    if(1/*GL_FALSE == vp->loaded*/)
     {
-	    if(vp->r700Shader.bNeedsAssembly == GL_TRUE)
+	    if(1/*vp->r700Shader.bNeedsAssembly == GL_TRUE*/)
 	    {
 		    Assemble( &(vp->r700Shader) );
 	    }