diff --git a/documentation/wine.man.in b/documentation/wine.man.in
index 58025436f4e..47b1b263fe9 100644
--- a/documentation/wine.man.in
+++ b/documentation/wine.man.in
@@ -15,9 +15,14 @@ section of the man page.
 loads and runs the given program, where the program is a DOS, Windows 3.x,
 or Win32 executable (x86 binaries only).
 .PP
+For debugging wine, use
+.B winedbg
+.I program
+instead.
+.PP
 .B wine 
 currently runs a growing list of applications written for Win3.1,
-Win95, Win95, and Windows NT. Older, simpler applications work better than
+Win95, Win98, and Windows NT. Older, simpler applications work better than
 newer, more complex ones.  A large percentage of the API has been implemented,
 although there are still several major pieces of work left to do.
 .SH REQUIREMENTS
@@ -39,7 +44,7 @@ If you have FreeBSD, make sure you have the USER_LDT,
 SYSVSHM, SYSVSEM, and SYSVMSG options turned on in your kernel. If you
 are building 
 .B wine 
-on Solaris, you will most likely need to build Wine with the GNU toolchain 
+on Solaris, you will most likely need to build wine with the GNU toolchain 
 (gcc, gas, etc.)
 .PP
 .B X
diff --git a/include/winuser.h b/include/winuser.h
index 495115b0c21..7f0bdd625f3 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -205,6 +205,7 @@ typedef struct
 #define BS_AUTORADIOBUTTON     0x00000009L
 #define BS_OWNERDRAW           0x0000000BL
 #define BS_LEFTTEXT            0x00000020L
+#define BS_RIGHTBUTTON         BS_LEFTTEXT
 
 #define BS_TEXT                0x00000000L
 #define BS_ICON                0x00000040L
diff --git a/loader/elfdll.c b/loader/elfdll.c
index 5426eef32d0..c4dda2cf0c2 100644
--- a/loader/elfdll.c
+++ b/loader/elfdll.c
@@ -102,6 +102,8 @@ void *ELFDLL_dlopen(const char *libname, int flags)
 		handle = dlopen(buffer, flags);
 		if(handle)
 			return handle;
+		else
+			TRACE("possible dlopen() error: %s\n", dlerror());
 	}
 	return NULL;
 }
diff --git a/loader/ne/module.c b/loader/ne/module.c
index a0427cd48f6..9295af92cd9 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -950,7 +950,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_
 				hModule = GetModuleHandle16(libname);
 				if(!hModule)
 				{
-					ERR("Serious trouble. Just loaded module '%s' (hinst=0x%04x), but can't get module handle\n",
+					ERR("Serious trouble. Just loaded module '%s' (hinst=0x%04x), but can't get module handle. Filename too long ?\n",
 						libname, hinst);
 					return 6;	/* ERROR_INVALID_HANDLE seems most appropriate */
 				}
@@ -963,7 +963,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_
 					return 6;	/* ERROR_INVALID_HANDLE seems most appropriate */
 				}
 
-				TRACE("Loaded module '%s' at 0x%04x, \n", libname, hinst);
+				TRACE("Loaded module '%s' at 0x%04x.\n", libname, hinst);
 
 				/*
 				 * Call initialization routines for all loaded DLLs. Note that
@@ -1332,7 +1332,7 @@ INT16 WINAPI GetModuleFileName16( HINSTANCE16 hModule, LPSTR lpFileName,
     lstrcpynA( lpFileName, NE_MODULE_NAME(pModule), nSize );
     if (pModule->expected_version >= 0x400)
 	GetLongPathNameA(NE_MODULE_NAME(pModule), lpFileName, nSize);
-    TRACE("%s\n", lpFileName );
+    TRACE("%04x -> '%s'\n", hModule, lpFileName );
     return strlen(lpFileName);
 }
 
diff --git a/tools/wineinstall b/tools/wineinstall
index 8f4e11f5d0b..d09ff04591a 100755
--- a/tools/wineinstall
+++ b/tools/wineinstall
@@ -295,7 +295,7 @@ then {
   }
   done
   echo "Configuring Wine for a no-windows install in $CROOT..."
-  for tdir in "$CROOT/windows" "$CROOT/windows/system" "$CROOT/windows/Start Menu" "$CROOT/windows/Start Menu/Programs"
+  for tdir in "$CROOT/windows" "$CROOT/windows/system" "$CROOT/windows/Start Menu" "$CROOT/windows/Start Menu/Programs" "$CROOT/Common Files"
   do [ -d "$tdir" ] || mkdir "$tdir"
   done
   [ -f "$CROOT/windows/win.ini" ]    || cp "$WININI"    "$CROOT/windows/win.ini"