diff --git a/ChangeLog b/ChangeLog
index 3fc97c5e7..3ded9f878 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-01 Stefan Bidigaray <stefanbidi@gmail.com>
+
+	* Source/NSLocale.m: Fixed typos found by testsuite.
+
 2010-12-31 Stefan Bidigaray <stefanbidi@gmail.com>
 
 	* Source/NSCalendar.m: Implemented -dateByAddingComponents:toDate:options:
diff --git a/Source/NSLocale.m b/Source/NSLocale.m
index 1477a8f1c..3c5aa8c4c 100644
--- a/Source/NSLocale.m
+++ b/Source/NSLocale.m
@@ -181,7 +181,7 @@ static NSArray *_currencyCodesWithType (uint32_t currType)
   msystem = ulocdata_getMeasurementSystem (cLocaleId, &err);
   if (U_SUCCESS(err))
     {
-      if (msystem == UMS_US)
+      if (msystem == UMS_SI)
         result = @"Metric";
       else
         result = @"U.S.";
@@ -870,6 +870,7 @@ static NSRecursiveLock *classLock = nil;
       if (mSys != nil)
         {
           [_components setValue: mSys forKey: NSLocaleMeasurementSystem];
+          NSLog (@"%@", mSys);
           if ([mSys isEqualToString: @"Metric"])
             result = [NSNumber numberWithBool: YES];
           else
@@ -883,7 +884,7 @@ static NSRecursiveLock *classLock = nil;
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
   else if ([key isEqualToString: NSLocaleQuotationBeginDelimiterKey])
     result = [self _getDelimiterWithType: ULOCDATA_QUOTATION_START];
-  else if ([key isEqualToString: NSLocaleQuotationBeginDelimiterKey])
+  else if ([key isEqualToString: NSLocaleQuotationEndDelimiterKey])
     result = [self _getDelimiterWithType: ULOCDATA_QUOTATION_END];
   else if ([key isEqualToString: NSLocaleAlternateQuotationBeginDelimiterKey])
     result = [self _getDelimiterWithType: ULOCDATA_ALT_QUOTATION_START];