diff --git a/src/apps/terminal/TerminalApp.cpp b/src/apps/terminal/TerminalApp.cpp
index ced0e95379..49952d1665 100644
--- a/src/apps/terminal/TerminalApp.cpp
+++ b/src/apps/terminal/TerminalApp.cpp
@@ -67,6 +67,7 @@ void
 TerminalApp::OpenTerminal(BMessage * message)
 {
 	TerminalWindow * terminal = new TerminalWindow(message);
+	(void)terminal;
 	fWindowOpened = true;
 }
 
@@ -132,7 +133,7 @@ struct option title_opt = { "title", required_argument, 0, 't' } ;
 struct option options[] =
  { curbg_opt, curfg_opt, bg_opt, fg_opt, 
    geom_opt, help_opt, meta_opt, pref_opt,
-   selbg_opt, selfg_opt, title_opt, 0
+   selbg_opt, selfg_opt, title_opt, {0}
  };
 
 status_t
@@ -164,7 +165,6 @@ TerminalApp::ArgvReceived(int32 argc, char * const argv[], const char * cwd)
 	if (argc > 1) {
 		if (argv[1][0] == '-') {
 			const char * execname = (argc >= 1 ? argv[0] : "");
-			const char * title = 0;
 			int indexptr = 0;
 			int ch;
 			char * const * optargv = argv;
@@ -177,12 +177,12 @@ TerminalApp::ArgvReceived(int32 argc, char * const argv[], const char * cwd)
 				case 'g':
 					printf("geometry is %s = ",optarg);
 					int m, n;
-					if ((sscanf(optarg,"%ldx%ld%s",&m,&n) != 2) || (m < 0) || (n < 0)) {
+					if ((sscanf(optarg,"%dx%d",&m,&n) != 2) || (m < 0) || (n < 0)) {
 						printf("??\n");
 						printf("geometry must be of the format MxN where M and N are positive integers\n");
 						return;
 					}
-					printf("%ld,%ld\n",m,n);
+					printf("%d,%d\n",m,n);
 					terminal.AddInt32("columns",m);
 					terminal.AddInt32("rows",n);					
 				break;
@@ -305,9 +305,9 @@ TerminalApp::ArgvReceived(int32 argc, char * const argv[], const char * cwd)
 					}
 					break;
 					default:
-						printf("invalid indexptr %ld\n",indexptr);
+						printf("invalid indexptr %d\n",indexptr);
 						return;
-					}		
+					}
 				}
 			}
 		}
diff --git a/src/apps/terminal/TerminalApp.h b/src/apps/terminal/TerminalApp.h
index 37bb517e28..40fa1eb860 100644
--- a/src/apps/terminal/TerminalApp.h
+++ b/src/apps/terminal/TerminalApp.h
@@ -4,6 +4,7 @@
 #include <Application.h>
 #include <Message.h>
 #include <Roster.h>
+#include <cassert>
 
 class TerminalWindow;
 
@@ -15,6 +16,7 @@ public:
 	virtual         ~TerminalApp();
 	virtual void 	MessageReceived(BMessage *message);
 	virtual	void	ArgvReceived(int32 argc, char * const argv[], const char * cwd);
+	virtual	void	ArgvReceived(int32 argc, char **argv) { assert(false); }
 	virtual void	RefsReceived(BMessage *message);
 	virtual void	ReadyToRun();
 
diff --git a/src/apps/terminal/TerminalWindow.cpp b/src/apps/terminal/TerminalWindow.cpp
index 93e7d539bb..43884dfc62 100644
--- a/src/apps/terminal/TerminalWindow.cpp
+++ b/src/apps/terminal/TerminalWindow.cpp
@@ -62,9 +62,10 @@ TerminalWindow::InitWindow(int32 id, entry_ref * settingsRef)
 	AddChild(view);
 	rgb_color white = {255,255,255,0};
 	view->SetViewColor(white);
-	BShelf * shelf = new BShelf(view);
+//	BShelf * shelf = new BShelf(view);
 
-	status_t ignore = RestoreSettings(settingsRef);
+//	status_t ignore = RestoreSettings(settingsRef);
+	RestoreSettings(settingsRef);
 	
 	BString unTitled;
 	unTitled.SetTo("Terminal ");