diff --git a/sope-appserver/NGObjWeb/SoObjects/SoDefaultRenderer.m b/sope-appserver/NGObjWeb/SoObjects/SoDefaultRenderer.m
index cffffe844..62068a51d 100644
--- a/sope-appserver/NGObjWeb/SoObjects/SoDefaultRenderer.m
+++ b/sope-appserver/NGObjWeb/SoObjects/SoDefaultRenderer.m
@@ -128,7 +128,12 @@ - (NSException *)renderComponent:(WOComponent *)_c inContext:(WOContext *)_ctx{
     [self debugWithFormat:
 	    @"    as component (use appendToResponse:inContext:)"];
   }
-  [r setHeader:@"text/html" forKey:@"content-type"];
+
+  if ([r contentEncoding] == NSUTF8StringEncoding)
+    [r setHeader:@"text/html; charset=utf-8" forKey:@"content-type"];
+  else
+    [r setHeader:@"text/html" forKey:@"content-type"];
+
   [_ctx setPage:_c];
   [_ctx enterComponent:_c content:nil];
   [_c appendToResponse:r inContext:_ctx];
diff --git a/sope-gdl1/GDLAccess/FoundationExt/PrintfFormatScanner.m b/sope-gdl1/GDLAccess/FoundationExt/PrintfFormatScanner.m
index de9091054..7d4a24823 100644
--- a/sope-gdl1/GDLAccess/FoundationExt/PrintfFormatScanner.m
+++ b/sope-gdl1/GDLAccess/FoundationExt/PrintfFormatScanner.m
@@ -33,7 +33,7 @@ - (NSString *)stringWithFormat:(NSString *)format arguments:(va_list)args {
 
 #ifdef __va_copy
     // args being NULL breaks heavily on amd64
-    if (args) {
+    if (args != NULL) {
         __va_copy(va, args);
     } else {
 	return format;