@@ -545,26 +545,26 @@
 
 		namespace = namespaceForPrefix(_prefix, _namespaces);
 
 		if (_prefix != nil && namespace == nil)
 			@throw [OFUnboundPrefixException
-			    exceptionWithPrefix: _prefix
+			    exceptionWithPrefix: (OFString *)_prefix
 					 parser: self];
 
 		if ([_delegate respondsToSelector: @selector(parser:
 		    didStartElement:prefix:namespace:attributes:)])
 			[_delegate parser: self
-			  didStartElement: _name
+			  didStartElement: (OFString *)_name
 				   prefix: _prefix
 				namespace: namespace
 			       attributes: nil];
 
 		if (_data[_i] == '/') {
 			if ([_delegate respondsToSelector:
 			    @selector(parser:didEndElement:prefix:namespace:)])
 				[_delegate parser: self
-				    didEndElement: _name
+				    didEndElement: (OFString *)_name
 					   prefix: _prefix
 					namespace: namespace];
 
 			if ([_previous count] == 0)
 				_finishedParsing = true;
@@ -632,17 +632,18 @@
 
 	[_buffer removeAllItems];
 
 	namespace = namespaceForPrefix(_prefix, _namespaces);
 	if (_prefix != nil && namespace == nil)
-		@throw [OFUnboundPrefixException exceptionWithPrefix: _prefix
-							      parser: self];
+		@throw [OFUnboundPrefixException
+		    exceptionWithPrefix: (OFString *)_prefix
+				 parser: self];
 
 	if ([_delegate respondsToSelector:
 	    @selector(parser:didEndElement:prefix:namespace:)])
 		[_delegate parser: self
-		    didEndElement: _name
+		    didEndElement: (OFString *)_name
 			   prefix: _prefix
 			namespace: namespace];
 
 	objc_autoreleasePoolPop(pool);
 
@@ -683,12 +684,13 @@
 	attributesCount = [_attributes count];
 
 	namespace = namespaceForPrefix(_prefix, _namespaces);
 
 	if (_prefix != nil && namespace == nil)
-		@throw [OFUnboundPrefixException exceptionWithPrefix: _prefix
-							      parser: self];
+		@throw [OFUnboundPrefixException
+		    exceptionWithPrefix: (OFString *)_prefix
+				 parser: self];
 
 	for (size_t j = 0; j < attributesCount; j++)
 		resolveAttributeNamespace(attributesObjects[j], _namespaces,
 		    self);
 
@@ -695,20 +697,20 @@
 	pool = objc_autoreleasePoolPush();
 
 	if ([_delegate respondsToSelector:
 	    @selector(parser:didStartElement:prefix:namespace:attributes:)])
 		[_delegate parser: self
-		  didStartElement: _name
+		  didStartElement: (OFString *)_name
 			   prefix: _prefix
 			namespace: namespace
 		       attributes: _attributes];
 
 	if (_data[_i] == '/') {
 		if ([_delegate respondsToSelector:
 		    @selector(parser:didEndElement:prefix:namespace:)])
 			[_delegate parser: self
-			    didEndElement: _name
+			    didEndElement: (OFString *)_name
 				   prefix: _prefix
 				namespace: namespace];
 
 		if ([_previous count] == 0)
 			_finishedParsing = true;
@@ -717,11 +719,11 @@
 	} else if (_prefix != nil) {
 		OFString *str = [OFString stringWithFormat: @"%@:%@",
 							    _prefix, _name];
 		[_previous addObject: str];
 	} else
-		[_previous addObject: _name];
+		[_previous addObject: (OFString *)_name];
 
 	objc_autoreleasePoolPop(pool);
 
 	[_name release];
 	[_prefix release];
@@ -828,15 +830,16 @@
 
 	if (_attributePrefix == nil && [_attributeName isEqual: @"xmlns"])
 		[[_namespaces lastObject] setObject: attributeValue
 					     forKey: @""];
 	if ([_attributePrefix isEqual: @"xmlns"])
-		[[_namespaces lastObject] setObject: attributeValue
-					     forKey: _attributeName];
+		[[_namespaces lastObject]
+		    setObject: attributeValue
+		       forKey: (OFString *)_attributeName];
 
 	[_attributes addObject:
-	    [OFXMLAttribute attributeWithName: _attributeName
+	    [OFXMLAttribute attributeWithName: (OFString *)_attributeName
 				    namespace: _attributePrefix
 				  stringValue: attributeValue]];
 
 	objc_autoreleasePoolPop(pool);