diff --git a/source/Makefile b/source/Makefile
index 99155206987..558a844eca7 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -142,6 +142,7 @@ ifneq ($(NAN_NO_KETSJI),true)
     COMLIB += $(OCGDIR)/gameengine/OpenGLrasterizer/$(DEBUG_DIR)libOpenGLrasterizer.a
     COMLIB += $(OCGDIR)/gameengine/expression/$(DEBUG_DIR)libexpression.a
     COMLIB += $(OCGDIR)/gameengine/scenegraph/$(DEBUG_DIR)libscenegraph.a
+    COMLIB += $(OCGDIR)/gameengine/videotex/$(DEBUG_DIR)libvideotex.a
 #    COMLIB += $(OCGDIR)/sumo/$(DEBUG_DIR)libfuzzics.a
 #    COMLIB += $(OCGDIR)/sumo/$(DEBUG_DIR)libsolid.a
     COMLIB += $(NAN_MOTO)/lib/libmoto.a
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index 0dcdc36fdcd..8aca111f41f 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -3549,7 +3549,7 @@ void logic_buts(void)
 		if(ob->controllers.first) uiSetCurFont(block, UI_HELV);
 		uiDefButBitS(block, TOG, OB_ADDCONT, B_ADD_CONT, "Add",(short)(xco+width-40), yco, 50, 19, &ob->scaflag, 0, 0, 0, 0, "Add a new Controller");
 		uiBlockEndAlign(block);
-		yco-=17;
+		yco-=20;
 		
 		/* mark all actuators linked to these controllers */
 		/* note that some of these actuators could be from objects that are not in the display list.
diff --git a/source/gameengine/Makefile b/source/gameengine/Makefile
index 1d3bc8c2058..51bc0f7d39f 100644
--- a/source/gameengine/Makefile
+++ b/source/gameengine/Makefile
@@ -35,7 +35,7 @@ DIR = $(OCGDIR)/gameengine
 DIRS = BlenderRoutines
 DIRS += Converter
 DIRS += Expressions GameLogic Ketsji Rasterizer SceneGraph
-DIRS += Network Physics
+DIRS += Network Physics VideoTexture
 
 ifeq ($(WITH_BF_BLENDERGAMEENGINE),true)
   DIRS += GamePlayer
diff --git a/source/nan_compile.mk b/source/nan_compile.mk
index 151c741e8b4..4b13ef8f678 100644
--- a/source/nan_compile.mk
+++ b/source/nan_compile.mk
@@ -89,8 +89,8 @@ ifeq ($(OS),darwin)
         CFLAGS	+= -pipe -fPIC -ffast-math -march=pentium-m -funsigned-char -fno-strict-aliasing
         CCFLAGS	+= -pipe -fPIC  -funsigned-char -fno-strict-aliasing
 	endif
-    REL_CFLAGS	+= -O2
-    REL_CCFLAGS	+= -O2
+#    REL_CFLAGS	+= -O2
+#    REL_CCFLAGS	+= -O2
     CPPFLAGS	+= -D_THREAD_SAFE
     NAN_DEPEND	= true
     OPENGL_HEADERS = /System/Library/Frameworks/OpenGL.framework