diff --git a/source/Makefile b/source/Makefile
index 079d94d0008..93a251d22d7 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -85,7 +85,6 @@ GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
 GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a
 GRPLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
 GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a	
-GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
 
 # nlin: the reason that some libraries appear more than once below is
 # to handle circular dependencies in linking among libraries... some
@@ -229,6 +228,8 @@ PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a
 PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a
 PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a
 PULIB += $(OCGDIR)/blender/windowmanager/libwindowmanager.a
+PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
+
 
 ifeq ($(NAN_NO_KETSJI),true)
     PULIB += $(NAN_MOTO)/lib/libmoto.a
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 2fbfa974360..aa588f508e5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3510,6 +3510,7 @@ static void direct_link_windowmanager(FileData *fd, wmWindowManager *wm)
 	wm->windowkeymap.first= wm->windowkeymap.last= NULL;
 	wm->screenkeymap.first= wm->screenkeymap.last= NULL;
 	
+	wm->windrawable= NULL;
 	wm->initialized= 0;
 }
 
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index d85642eecbf..68b3b43c376 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -159,7 +159,7 @@ typedef struct wmOperator {
 	vec3i	veci;
 	float fac, deltaf;
 	int value, delta;
-
+	
 	/* custom storage, dna pointer */
 	void *customdata; 
 	/* or IDproperty list */