Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -9,11 +9,11 @@
 AC_PROG_LN_S
 AC_PATH_PROG(AR, ar)
 
 case "$CC" in
 	gcc | *-gcc | gcc-* | *-gcc-*)
-		OBJCFLAGS="$OBJSFLAGS -Wall -Werror -pipe"
+		OBJCFLAGS="$OBJSFLAGS -Wall -Werror -pipe -g"
 		;;
 esac
 
 OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstString -fobjc-exceptions"
 

Index: src/OFWideString.m
==================================================================
--- src/OFWideString.m
+++ src/OFWideString.m
@@ -96,18 +96,16 @@
 	strlength = wcslen(wstr);
 	newlen = length + strlength;
 
 	/* FIXME: Add error handling */
 	if ((newstr = [self resizeMem: wstring
-			       toSize: (newlen + 1 ) * sizeof(wchar_t)]) == 
-	    NULL)
+			       toSize: (newlen + 1) * sizeof(wchar_t)]) == NULL)
 		return nil;
 
-	memcpy(newstr + length * sizeof(wchar_t), wstr,
-	    (strlength + 1) * sizeof(wchar_t));
+	memcpy(newstr + length, wstr, (strlength + 1) * sizeof(wchar_t));
 
 	length = newlen;
 	wstring = newstr;
 
 	return self;
 }
 @end