diff --git a/source/blender/radiosity/intern/source/radio.c b/source/blender/radiosity/intern/source/radio.c
index 91fd7435fb2..923ab69db6e 100644
--- a/source/blender/radiosity/intern/source/radio.c
+++ b/source/blender/radiosity/intern/source/radio.c
@@ -264,6 +264,7 @@ void add_radio()
 	rad->elmi= 20;
 	rad->nodelim= 0;
 	rad->maxnode= 10000;
+	rad->maxiter= 120;	// arbitrary
 	rad->flag= 2;
 	set_radglobal();
 }
diff --git a/source/blender/radiosity/intern/source/radrender.c b/source/blender/radiosity/intern/source/radrender.c
index aa7e0d589d1..f4260cc7e32 100644
--- a/source/blender/radiosity/intern/source/radrender.c
+++ b/source/blender/radiosity/intern/source/radrender.c
@@ -498,7 +498,7 @@ void make_vertex_rad_values()
 	
 	/* make vertex colors */
 	RG.igamma= 1.0/RG.gamma;
-	RG.radfactor= RG.radfac*pow(64*64, RG.igamma)/256.0; /* compatible with radio-tool */
+	RG.radfactor= RG.radfac*pow(64*64, RG.igamma)/128.0; /* compatible with radio-tool */
 
 	for(a=0; a<R.totvert; a++) {
 		if((a & 255)==0) v1= R.blove[a>>8]; else v1++;
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 0153974c370..5a4227ce44a 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -1897,13 +1897,6 @@ void shade_lamp_loop()
 		}
 	}
 
-	if( ma->mode & MA_RADIO) {
-		ir+= ma->amb*R.rad[0];
-		ig+= ma->amb*R.rad[1];
-		ib+= ma->amb*R.rad[2];
-	}
-
-		
 	if(R.refcol[0]==0.0) {
 		a= 65535.0*( ma->r*ir +ma->ambr +isr +ma->amb*R.rad[0]);
 		if(a>65535) a=65535; else if(a<0) a= 0;
@@ -2327,6 +2320,7 @@ void shadepixel(float x, float y, int vlaknr)
 		}
 		else {
 			VECCOPY(R.vn, vlr->n);
+			R.rad[0]= R.rad[1]= R.rad[2]= 0.0;
 		}
 		if(R.matren->texco & TEXCO_WINDOW) {
 			R.winco[0]= (x+(R.xstart))/(float)R.afmx;