@@ -354,16 +354,10 @@
 {
 	[self finishInitialization];
 	return [self stringByAppendingPathExtension: extension];
 }
 
-- (OFString *)stringByPrependingString: (OFString *)string
-{
-	[self finishInitialization];
-	return [self stringByPrependingString: string];
-}
-
 - (OFString *)stringByReplacingOccurrencesOfString: (OFString *)string
 					withString: (OFString *)replacement
 {
 	[self finishInitialization];
 	return [self stringByReplacingOccurrencesOfString: string
@@ -481,11 +475,11 @@
 {
 	[self finishInitialization];
 	return self.longLongValue;
 }
 
-- (long long)longLongValueWithBase: (int)base
+- (long long)longLongValueWithBase: (unsigned char)base
 {
 	[self finishInitialization];
 	return [self longLongValueWithBase: base];
 }
 
@@ -493,11 +487,11 @@
 {
 	[self finishInitialization];
 	return self.unsignedLongLongValue;
 }
 
-- (unsigned long long)unsignedLongLongValueWithBase: (int)base
+- (unsigned long long)unsignedLongLongValueWithBase: (unsigned char)base
 {
 	[self finishInitialization];
 	return [self unsignedLongLongValueWithBase: base];
 }
 
@@ -589,20 +583,20 @@
 	[self finishInitialization];
 	[self writeToFile: path encoding: encoding];
 }
 #endif
 
-- (void)writeToURL: (OFURL *)URL
+- (void)writeToURI: (OFURI *)URI
 {
 	[self finishInitialization];
-	[self writeToURL: URL];
+	[self writeToURI: URI];
 }
 
-- (void)writeToURL: (OFURL *)URL encoding: (OFStringEncoding)encoding
+- (void)writeToURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
 {
 	[self finishInitialization];
-	[self writeToURL: URL encoding: encoding];
+	[self writeToURI: URI encoding: encoding];
 }
 
 #ifdef OF_HAVE_BLOCKS
 - (void)enumerateLinesUsingBlock: (OFStringLineEnumerationBlock)block
 {