+diff --git a/Makefile b/Makefile
+index c80378c..428aa74 100644
+--- a/Makefile
++++ b/Makefile
+@@ -453,7 +453,7 @@ ifeq ($(TARGET),beos)
+ 	$(Q)$(BEOS_SETVER) $(EXETARGET) \
+                 -app $(VERSION_MAJ) $(VERSION_MIN) 0 d 0 \
+                 -short "NetSurf $(VERSION_FULL)" \
+-                -long "NetSurf $(VERSION_FULL) © 2003 - 2008 The NetSurf Developers"
++                -long "NetSurf $(VERSION_FULL) © 2003 - 2012 The NetSurf Developers"
+ 	$(VQ)echo " MIMESET: $(EXETARGET)"
+ 	$(Q)$(BEOS_MIMESET) $(EXETARGET)
+ endif
 diff --git a/beos/Makefile.target b/beos/Makefile.target
 index b1d1eaa..461ecbc 100644
 --- a/beos/Makefile.target

 
 # ----------------------------------------------------------------------------
 # Package target
diff --git a/beos/gui.cpp b/beos/gui.cpp
index b275616..3f7e943 100644
--- a/beos/gui.cpp

 nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 {
 	struct beos_scaffolding *g = (struct beos_scaffolding *)malloc(sizeof(*g));
@@ -1676,7 +1800,6 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 
 	g->window = NULL;
 	g->menu_bar = NULL;
-	g->window = NULL;
 
 	if (replicated && !replicant_view) {
 		warn_user("Error: No subwindow allowed when replicated.", NULL);
@@ -1685,7 +1808,6 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 
 
 	if (!replicant_view) {
-
 		BRect frame(0, 0, 600-1, 500-1);
 		if (nsoption_int(window_width) > 0) {
 			frame.Set(0, 0, nsoption_int(window_width) - 1, nsoption_int(window_height) - 1);
@@ -1696,7 +1818,7 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 			NSBrowserWindow *win = nsbeos_find_last_window();
 			if (win) {
 				pos = win->Frame().LeftTop();
-				win->Unlock();
+				win->UnlockLooper();
 			}
 			pos += BPoint(20, 20);
 			BScreen screen;
@@ -2038,14 +2160,13 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
 	rect = g->top_view->Bounds();
 	rect.bottom = rect.top + TOOLBAR_HEIGHT - 1;
 	rect.right = rect.right - DRAGGER_WIDTH;
