--- dev86/bcc/bcc.c
+++ dev86/bcc/bcc.c
@@ -603,10 +603,7 @@ validate_link_opts()
 void
 command_reset()
 {
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-   char buf[MAXPATHLEN];
+   char buf[PATH_MAX];
    char ** prefix;
    char * saved_cmd;
 
@@ -1326,7 +1323,7 @@ void reset_prefix_path()
 
 	 free(temp);
          d=strchr(s, ':');
-	 if( d ) *d='\0';
+	 if( d ) *(d++)='\0';
 	 temp = xalloc(strlen(progname)+strlen(s)+2);
 	 strcpy(temp, s);
 	 strcat(temp, "/");
@@ -1339,7 +1336,6 @@ void reset_prefix_path()
          }
 #endif
 	 if( access(temp, X_OK) == 0 ) break;
-	 d++;
       }
       if( s == 0 )
       {