diff --git a/Headers/Foundation/NSRegularExpression.h b/Headers/Foundation/NSRegularExpression.h
index fbb40a001..18481834f 100644
--- a/Headers/Foundation/NSRegularExpression.h
+++ b/Headers/Foundation/NSRegularExpression.h
@@ -66,7 +66,7 @@ static const NSMatchingOptions NSMatchingWithoutAnchoringBounds = 1<<4;
 
 @class	NSRegularExpression;
 
-#if     GS_API_VERSION(GS_API_NONE, GS_API_NONE)
+#if     GS_API_VERSION( 13100, GS_API_LATEST)
 /** Enumeration with a C function callback uses this prototype
  */
 typedef void (*GSRegexEnumerationCallback)(NSRegularExpression *regex,
@@ -129,7 +129,7 @@ GS_EXPORT_CLASS
 	       options: (NSRegularExpressionOptions)opts
 		 error: (NSError**)e;
 - (NSString*) pattern; 
-#if     GS_API_VERSION(GS_API_NONE, GS_API_NONE)
+#if     GS_API_VERSION( 13100, GS_API_LATEST)
 /** In the GNUstep implementation this method is the fundametal primitive
  * (unlike OSX which depends on blocks) upon which other methods are based.
  * Its behavior is like that of the
diff --git a/Tests/base/NSRegularExpression/basic.m b/Tests/base/NSRegularExpression/basic.m
index d63f6cb2f..7e51276eb 100644
--- a/Tests/base/NSRegularExpression/basic.m
+++ b/Tests/base/NSRegularExpression/basic.m
@@ -101,7 +101,7 @@ int main()
                                              withTemplate: @"c"];
   PASS_EQUAL(replacement, @"cb", "Replacement correct");
 
-  NSString *replMut = [NSMutableString stringWithString: @"ab"];
+  NSMutableString *replMut = [NSMutableString stringWithString: @"ab"];
   [testObj replaceMatchesInString: replMut
                           options: 0
                             range: NSMakeRange(0,2)
@@ -119,7 +119,7 @@ int main()
   NSTextCheckingResult *r = [testObj firstMatchInString: @"ab"
                                                 options: 0
                                                   range: NSMakeRange(0,2)];
-  PASS(r, "Found NSTextCheckingResult");
+  PASS(r != nil, "Found NSTextCheckingResult");
   replacement = @"should be unset on return";
   replacement = [testObj replacementStringForResult: r
                                            inString: @"ab"