diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index 05b0b9f134e..f356c97c987 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -1596,6 +1596,12 @@ static void modifiers_bindMeshDeform(void *ob_v, void *md_v)
 		else if(ob->type == OB_LATTICE) {
 			lattice_calc_modifiers(ob);
 		}
+		else if(ob->type==OB_MBALL) {
+			makeDispListMBall(ob);
+		}
+		else if(ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
+			makeDispListCurveTypes(ob, 0);
+		}
 
 		mmd->needbind= 0;
 		mmd->modifier.mode= mode;
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 3a3d653fdf2..731fe49e4c9 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -3766,7 +3766,7 @@ static void object_panel_particle_extra(Object *ob)
 		
 		butx+=butw;
 
-		uiDefButS(block, MENU, B_PART_REDRAW, menustr,	butx,buty,buth,buth, psys->vgroup+vgnum, 0, defCount, 0, 0, "Browses available vertex groups");
+		but= uiDefButS(block, MENU, B_PART_REDRAW, menustr,	butx,buty,buth,buth, psys->vgroup+vgnum, 0, defCount, 0, 0, "Browses available vertex groups");
 		uiButSetFunc(but, particle_set_vg, (void *)ob, (void *)(&vgnum));
 		MEM_freeN (menustr);
 
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c
index 52a8f9a34ef..e8f14ef73ed 100644
--- a/source/blender/src/drawobject.c
+++ b/source/blender/src/drawobject.c
@@ -3407,10 +3407,9 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
 /* 6. */
 
 		glGetIntegerv(GL_POLYGON_MODE, polygonmode);
+		glDisableClientState(GL_NORMAL_ARRAY);
 
 		if(draw_as != PART_DRAW_CIRC){
-			glDisableClientState(GL_NORMAL_ARRAY);
-
 			if(draw_as==PART_DRAW_PATH){
 				ParticleCacheKey **cache, *path;
 				float *cd2=0,*cdata2=0;