diff --git a/library/dirent_closedir.c b/library/dirent_closedir.c
index 31f47c4..697b45f 100644
--- a/library/dirent_closedir.c
+++ b/library/dirent_closedir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dirent_closedir.c,v 1.5 2005-02-03 16:56:15 obarthel Exp $
+ * $Id: dirent_closedir.c,v 1.6 2005-02-21 16:09:28 obarthel Exp $
  *
  * :ts=4
  *
@@ -51,7 +51,6 @@ int
 closedir(DIR * directory_pointer)
 {
 	struct DirectoryHandle * dh;
-	struct Node * node;
 	int result = -1;
 
 	ENTER();
@@ -96,6 +95,8 @@ closedir(DIR * directory_pointer)
 
 	#if defined(UNIX_PATH_SEMANTICS)
 	{
+		struct Node * node;
+
 		while((node = RemHead((struct List *)&dh->dh_VolumeList)) != NULL)
 			free(node);
 	}
diff --git a/library/dirent_opendir.c b/library/dirent_opendir.c
index ca4bd74..52ea871 100644
--- a/library/dirent_opendir.c
+++ b/library/dirent_opendir.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dirent_opendir.c,v 1.5 2005-02-03 16:56:15 obarthel Exp $
+ * $Id: dirent_opendir.c,v 1.6 2005-02-21 16:09:39 obarthel Exp $
  *
  * :ts=4
  *
@@ -89,7 +89,6 @@ opendir(const char * path_name)
 	#endif /* UNIX_PATH_SEMANTICS */
 	struct DirectoryHandle * dh = NULL;
 	DIR * result = NULL;
-	struct Node * node;
 
 	ENTER();
 
@@ -123,6 +122,8 @@ opendir(const char * path_name)
 
 	#if defined(UNIX_PATH_SEMANTICS)
 	{
+		struct Node * node;
+
 		NewList((struct List *)&dh->dh_VolumeList);
 
 		if(__unix_path_semantics)
@@ -256,6 +257,8 @@ opendir(const char * path_name)
 
 		#if defined(UNIX_PATH_SEMANTICS)
 		{
+			struct Node * node;
+
 			while((node = RemHead((struct List *)&dh->dh_VolumeList)) != NULL)
 				free(node);
 		}
diff --git a/library/stdio_iobhookentry.c b/library/stdio_iobhookentry.c
index 253450f..c442f3c 100644
--- a/library/stdio_iobhookentry.c
+++ b/library/stdio_iobhookentry.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdio_iobhookentry.c,v 1.3 2005-02-20 13:19:40 obarthel Exp $
+ * $Id: stdio_iobhookentry.c,v 1.4 2005-02-21 16:09:41 obarthel Exp $
  *
  * :ts=4
  *
@@ -62,6 +62,9 @@ __iob_hook_entry(
 			if(fd == NULL)
 			{
 				fam->fam_Error = EBADF;
+
+				result = -1;
+
 				break;
 			}
 
diff --git a/library/stdlib_assertion_failure.c b/library/stdlib_assertion_failure.c
index 3990a5f..b9a8474 100644
--- a/library/stdlib_assertion_failure.c
+++ b/library/stdlib_assertion_failure.c
@@ -1,5 +1,5 @@
 /*
- * $Id: stdlib_assertion_failure.c,v 1.6 2005-01-09 09:40:32 obarthel Exp $
+ * $Id: stdlib_assertion_failure.c,v 1.7 2005-02-21 16:09:44 obarthel Exp $
  *
  * :ts=4
  *
@@ -93,10 +93,11 @@ __assertion_failure(
 
 				es.es_StructSize	= sizeof(es);
 				es.es_Title			= (STRPTR)__program_name;
-				es.es_TextFormat	= (STRPTR)"Assertion of expression\n'%s'\nfailed in file '%s', line %ld";
+				es.es_TextFormat	= (STRPTR)"Assertion of expression\n\"%s\"\nfailed in file \"%s\", line %ld.";
 				es.es_GadgetFormat	= (STRPTR)"Sorry";
 
-				EasyRequest(NULL,&es,NULL,expression,file_name,line_number);
+				EasyRequest(NULL,&es,NULL,
+					expression,file_name,line_number);
 
 				#if defined(__amigaos4__)
 				{
@@ -113,7 +114,7 @@ __assertion_failure(
 				fprintf(stderr,"[%s] ",__program_name);
 
 			fprintf(stderr,
-				"%s:%d: failed assertion '%s'\n",
+				"%s:%d: failed assertion \"%s\".\n",
 					file_name,
 					line_number,
 					expression);