diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 251a14fd4b3..0a1787cb58c 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1064,7 +1064,7 @@ void armature_rebuild_pose(Object *ob, bArmature *arm)
 //	printf("rebuild pose %s, %d bones\n", ob->id.name, counter);
 	
 	/* synchronize protected layers with proxy */
-	if(ob->id.lib==NULL && ob->proxy)
+	if(OB_IS_PROXY(ob))
 		pose_proxy_synchronize(ob, ob->proxy, arm->layer_protected);
 	
 	update_pose_constraint_flags(ob->pose); // for IK detection for example
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 72cfb820138..2fa4fd25d06 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1441,7 +1441,7 @@ static void alfa_bezpart(BezTriple *prevbezt, BezTriple *bezt, Nurb *nu, float *
 	
 	for(a=0; a<resolu; a++, fac+= dfac) {
 		
-		set_four_ipo(fac, t, KEY_BSPLINE);
+		set_four_ipo(fac, t, KEY_LINEAR);
 		
 		data_a[a]= t[0]*pprev->alfa + t[1]*prevbezt->alfa + t[2]*bezt->alfa + t[3]*next->alfa;
 	}
@@ -1593,6 +1593,7 @@ void makeBevelList(Object *ob)
 					bevp->x= prevbezt->vec[1][0];
 					bevp->y= prevbezt->vec[1][1];
 					bevp->z= prevbezt->vec[1][2];
+					bevp->alfa= prevbezt->alfa;
 					bl->nr++;
 				}