diff --git a/src/dos/dos_classes.cpp b/src/dos/dos_classes.cpp
index d3a9f684..c6fc680f 100644
--- a/src/dos/dos_classes.cpp
+++ b/src/dos/dos_classes.cpp
@@ -244,7 +244,7 @@ void DOS_DTA::GetSearchParams(Bit8u & attr,char * pattern) {
 	memcpy(pattern,temp,8);
 	pattern[8]='.';
 	memcpy(&pattern[9],&temp[8],3);
-	pattern[12]=0;
+//	pattern[12]=0;
 
 }
 
diff --git a/src/dos/drive_local.cpp b/src/dos/drive_local.cpp
index 54564901..d4b1b046 100644
--- a/src/dos/drive_local.cpp
+++ b/src/dos/drive_local.cpp
@@ -96,7 +96,7 @@ bool localDrive::FindFirst(char * _dir,DOS_DTA & dta) {
 	CROSS_FILENAME(srch_dir);
 
 	char end[2]={CROSS_FILESPLIT,0};
-	if (srch_dir[strlen(srch_dir)]!=CROSS_FILESPLIT) strcat(srch_dir,end);
+	if (srch_dir[strlen(srch_dir)-1]!=CROSS_FILESPLIT) strcat(srch_dir,end);
 	if((srch_opendir=opendir(srch_dir))==NULL) return false;
 	return FindNext(dta);
 }