diff --git a/src/shell/shell_batch.cpp b/src/shell/shell_batch.cpp
index b5757684..969b5efd 100644
--- a/src/shell/shell_batch.cpp
+++ b/src/shell/shell_batch.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell_batch.cpp,v 1.32 2009-01-19 19:55:03 qbix79 Exp $ */
+/* $Id: shell_batch.cpp,v 1.33 2009-04-02 19:08:26 qbix79 Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -145,7 +145,6 @@ bool BatchFile::Goto(char * where) {
 		E_Exit("SHELL:Goto Can't open BatchFile %s",cmd->GetFileName());
 	}
 
-	Bit32u pos=0;
 	char cmd_buffer[CMD_MAXLINE];
 	char * cmd_write;
 
@@ -180,7 +179,7 @@ again:
 			this->location = 0;
 			DOS_SeekFile(file_handle,&(this->location),DOS_SEEK_CUR);
 			DOS_CloseFile(file_handle);
-		   return true;
+			return true;
 		}
 	   
 	}
diff --git a/src/shell/shell_cmds.cpp b/src/shell/shell_cmds.cpp
index 94cebf73..6f27f541 100644
--- a/src/shell/shell_cmds.cpp
+++ b/src/shell/shell_cmds.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell_cmds.cpp,v 1.89 2009-02-15 10:45:01 c2woody Exp $ */
+/* $Id: shell_cmds.cpp,v 1.90 2009-04-02 19:08:26 qbix79 Exp $ */
 
 #include "dosbox.h"
 #include "shell.h"
@@ -487,8 +487,8 @@ void DOS_Shell::CMD_DIR(char * args) {
 			if (optW) {
 				WriteOut("[%s]",name);
 				size_t namelen = strlen(name);
-				if ((namelen>=0) && (namelen<=14)) {
-					for (Bitu i=14-(Bitu)namelen;i>0;i--) WriteOut(" ");
+				if (namelen <= 14) {
+					for (size_t i=14-namelen;i>0;i--) WriteOut(" ");
 				}
 			} else {
 				WriteOut("%-8s %-3s   %-16s %02d-%02d-%04d %2d:%02d\n",name,ext,"<DIR>",day,month,year,hour,minute);