diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index b5d080da247..b6f6820ca73 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -70,6 +70,7 @@
 
 #include "BKE_armature.h"
 #include "BKE_action.h"
+#include "BKE_bullet.h"
 #include "BKE_colortools.h"
 #include "BKE_deform.h"
 #include "BKE_DerivedMesh.h"
@@ -182,7 +183,7 @@ void object_free_softbody(Object *ob)
 void object_free_bulletsoftbody(Object *ob)
 {
 	if(ob->bsoft) {
-		sbFree(ob->bsoft);
+		bsbFree(ob->bsoft);
 		ob->bsoft= NULL;
 	}
 }
diff --git a/source/blender/python/api2_2x/Geometry.c b/source/blender/python/api2_2x/Geometry.c
index 6b7ec911c81..89c63870d59 100644
--- a/source/blender/python/api2_2x/Geometry.c
+++ b/source/blender/python/api2_2x/Geometry.c
@@ -413,7 +413,7 @@ static void boxPack_ToPyObject(PyObject * value, boxPack **boxarray)
 
 static PyObject *M_Geometry_BoxPack2D( PyObject * self, PyObject * boxlist )
 {
-	boxPack *boxarray;
+	boxPack *boxarray = NULL;
 	float tot_width, tot_height;
 	int len;
 	int error;
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 231533722c1..dbb3aaf7672 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -77,7 +77,8 @@
 #include "mydevice.h"
 #include "blendef.h" 
 #include "winlay.h"
-
+#include "PIL_time.h"
+#include <ctype.h> /* ispunct */
 #include <sys/stat.h>
 
 /***********************/ /*
diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c
index 76a4e1028f0..c26c44103c0 100644
--- a/source/blender/src/editcurve.c
+++ b/source/blender/src/editcurve.c
@@ -4111,7 +4111,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 		Mat3One(imat);
 		cent[0]= cent[1]= cent[2]= 0.0;
 	}
-
+	
 	if ELEM5(stype, 0, 1, 2, 4, 6) {
 		nu = (Nurb*)MEM_callocN(sizeof(Nurb), "addNurbprim");
 		nu->type= type;
@@ -4121,6 +4121,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 
 	switch(stype) {
 	case 0:	/* curve */
+		nu->resolu= 12; /* set as 4 above */
 		if(newname) {
 			rename_id((ID *)G.obedit, "Curve");
 			rename_id((ID *)G.obedit->data, "Curve");
@@ -4228,6 +4229,7 @@ Nurb *addNurbprim(int type, int stype, int newname)
 
 		break;
 	case 1:	/* circle */
+		nu->resolu= 12; /* set as 4 above */
 		if(newname) {
 			rename_id((ID *)G.obedit, "CurveCircle");
 			rename_id((ID *)G.obedit->data, "CurveCircle");