diff --git a/Headers/Additions/GNUstepBase/GSCategories.h b/Headers/Additions/GNUstepBase/GSCategories.h
index b7f7d7c62..b7e9d9049 100644
--- a/Headers/Additions/GNUstepBase/GSCategories.h
+++ b/Headers/Additions/GNUstepBase/GSCategories.h
@@ -277,11 +277,11 @@ typedef enum _NSGNUstepStringEncoding
 @end
 
 @interface NSLock (GSCategories)
-+ (id)newLockAt:(NSLock **)location;
++ (id)newLockAt:(id *)location;
 @end
 
 @interface NSRecursiveLock (GSCategories)
-+ (id)newLockAt:(NSLock **)location;
++ (id)newLockAt:(id *)location;
 @end
 
 
diff --git a/Source/Additions/GSCategories.m b/Source/Additions/GSCategories.m
index c431423b4..58f2f1a23 100644
--- a/Source/Additions/GSCategories.m
+++ b/Source/Additions/GSCategories.m
@@ -895,7 +895,7 @@ static NSRecursiveLock *local_lock = nil;
 @implementation _GSLockInitializer
 + (void)initialize
 {
-  if (!local_lock)
+  if (local_lock == nil)
     {
       local_lock = [GSLazyRecursiveLock new];
     }