Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -416,29 +416,29 @@
 	return self;
 }
 
 - upper
 {
-	size_t i = length;
+	char *p = string + length;
 
 	if (is_utf8)
 		@throw [OFInvalidEncodingException newWithClass: [self class]];
 
-	while (i--)
-		string[i] = toupper(string[i]);
+	while (--p >= string)
+		*p = toupper((int)*p);
 
 	return self;
 }
 
 - lower
 {
-	size_t i = length;
+	char *p = string + length;
 
 	if (is_utf8)
 		@throw [OFInvalidEncodingException newWithClass: [self class]];
 
-	while (i--)
-		string[i] = tolower(string[i]);
+	while (--p >= string)
+		*p = tolower((int)*p);
 
 	return self;
 }
 @end

Index: src/OFXMLFactory.m
==================================================================
--- src/OFXMLFactory.m
+++ src/OFXMLFactory.m
@@ -108,11 +108,11 @@
 
 + (char*)createStanza: (const char*)name
 	 withCloseTag: (BOOL)close
 	      andData: (const char*)data, ...
 {
-	char *arg, *val, *xml, *esc_val;
+	char *arg, *val, *xml, *esc_val = NULL;
 	size_t i, len;
 	va_list args;
 
 	/* Start of tag */
 	len = strlen(name);