diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 3d9dc096d24..6e26f408131 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -223,6 +223,7 @@ Scene *add_scene(char *name)
 	sce->toolsettings->uvcalc_cubesize = 1.0f;
 	sce->toolsettings->uvcalc_mapdir = 1;
 	sce->toolsettings->uvcalc_mapalign = 1;
+	sce->toolsettings->unwrapper = 1;
 	
 	sce->jumpframe = 10;
 
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 698204ac6bb..4b368be0c6e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5424,6 +5424,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			sce->toolsettings->uvcalc_mapdir = 1;
 			sce->toolsettings->uvcalc_mapalign = 1;
 			sce->toolsettings->uvcalc_flag = 1;
+			sce->toolsettings->unwrapper = 1;
 
 			/* enable uv editor local sticky by default */
 			for (sc= main->screen.first; sc; sc= sc->id.next) {
diff --git a/source/blender/src/parametrizer.c b/source/blender/src/parametrizer.c
index 65ebdd68e2d..68cb287b4c0 100644
--- a/source/blender/src/parametrizer.c
+++ b/source/blender/src/parametrizer.c
@@ -2661,7 +2661,7 @@ static PBool p_chart_symmetry_pins(PChart *chart, PEdge *outer, PVert **pin1, PV
 		}
 	}
 
-	if (!maxe1 || (maxlen < 0.5f*totlen))
+	if (!maxe1 || !maxe2 || (maxlen < 0.5f*totlen))
 		return P_FALSE;
 	
 	/* find pin1 in the split vertices */
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index c95c8403208..515e8d212ff 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -4183,8 +4183,6 @@ static void winqreadimagespace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 					initTransform(TFM_RESIZE, CTX_NONE);
 					Transform();
 				}
-				else if((G.qual==LR_SHIFTKEY) && is_uv_tface_editing_allowed())
-					smooth_area_tface_uv();
 				break;
 			case VKEY:
 				if((G.qual==0))