diff -ruN barnyard-0.2.0/src/ConfigFile.c barnyard-0.2.0-cleanup/src/ConfigFile.c
--- barnyard-0.2.0/src/ConfigFile.c	2004-03-24 23:04:40.000000000 -0600
+++ barnyard-0.2.0-cleanup/src/ConfigFile.c	2006-05-27 13:29:31.000000000 -0500
@@ -68,18 +68,11 @@
     {
         FatalError("Failed to open config file '%s': %s\n", filename,
                 strerror(errno));
-        goto error;
     }
 
     file_name = filename;
     file_line = 0;
 
-    if((fp = fopen(filename, "r")) == NULL)
-    {
-        FatalError("Failed to open config file \"%s\", check the filename "
-                   "and try again\n", filename);
-    }
-
     while((fgets(readbuf, STD_BUF, fp)) != NULL)
     {
         file_line++;
@@ -143,11 +136,6 @@
     fclose(fp);
     *cfvars = tmp;
     return 0;
-    
-error:
-    if(tmp)
-        ConfigFileVars_Free(tmp);
-    return -1;
 }
 
 int ContinuationCheck(char *line)
diff -ruN barnyard-0.2.0/src/classification.c barnyard-0.2.0-cleanup/src/classification.c
--- barnyard-0.2.0/src/classification.c	2003-05-02 22:20:54.000000000 -0500
+++ barnyard-0.2.0-cleanup/src/classification.c	2006-05-27 13:27:23.000000000 -0500
@@ -56,6 +56,9 @@
     }
 
     ReadClassFile(classfile);
+
+    fclose(classfile);
+    classfile = NULL;
 }
 
 void FreeClassData()
diff -ruN barnyard-0.2.0/src/sid.c barnyard-0.2.0-cleanup/src/sid.c
--- barnyard-0.2.0/src/sid.c	2003-05-02 22:20:54.000000000 -0500
+++ barnyard-0.2.0-cleanup/src/sid.c	2006-05-27 13:27:24.000000000 -0500
@@ -55,6 +55,9 @@
     }
 
     ReadSidFile(sidfile);
+
+    fclose(sidfile);
+    sidfile = NULL;
 }
 
 
@@ -359,6 +362,9 @@
     }
 
     ReadGenFile(genfile);
+
+    fclose(genfile);
+    genfile = NULL;
 }
 
 
diff -ruN barnyard-0.2.0/src/util.c barnyard-0.2.0-cleanup/src/util.c
--- barnyard-0.2.0/src/util.c	2004-03-06 16:30:15.000000000 -0600
+++ barnyard-0.2.0-cleanup/src/util.c	2006-05-27 14:04:09.000000000 -0500
@@ -264,8 +264,8 @@
 {
     int i;
     struct protoent *pt;
-    unsigned char *tmp;
-    u_char protoname[11];
+    char *tmp;
+    char protoname[11];
 
     for(i = 0; i < 256; i++)
     {
@@ -294,8 +294,8 @@
 {
     char conv[] = "0123456789ABCDEF";
     char *retbuf = NULL; 
-    char *index;
-    char *end;
+    u_char *index;
+    u_char *end;
     char *ridx;
 
     index = xdata;