diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 6ab702a41d4..dd58af0e88f 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -904,7 +904,7 @@ void clear_object(char mode)
 				// no test if we got armature; could be in future...
 				clear_armature(ob, mode);
 			}
-			else {
+			else if((G.f & G_WEIGHTPAINT)==0) {
 				
 				if(mode=='r') {
 					memset(ob->rot, 0, 3*sizeof(float));
@@ -2000,7 +2000,6 @@ void special_editmenu(void)
 								else BIF_undo_push("Boolean");
 								waitcursor(0);
 							} else {
-								ModifierTypeInfo *mti = modifierType_getInfo(eModifierType_Boolean);
 								BooleanModifierData *bmd = NULL;
 								bmd = (BooleanModifierData *)modifier_new(eModifierType_Boolean);
 								BLI_addtail(&ob->modifiers, bmd);
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index fabcadac585..ba85649a42e 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -1669,10 +1669,12 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					}
 				}
 				else if(G.qual==LR_CTRLKEY) {
-					make_track();
+					if(ob && (ob->flag & OB_POSEMODE));
+					else make_track();
 				}
 				else if(G.qual==LR_ALTKEY) {
-					clear_track();
+					if(ob && (ob->flag & OB_POSEMODE));
+					else clear_track();
 				}
 				else if((G.qual==0)){
 					texspace_edit();