diff --git a/ChangeLog b/ChangeLog
index 6fcae6b..aa63e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-02 Riccardo Mottola <rm@gnu.org>
+
+	* Framework/PCAddFilesPanel.m
+	* Framework/PCProjectBuilder.m
+	Do not use GS internals but standard methods.
+
 2014-08-29 Riccardo Mottola <rm@gnu.org>
 
 	* Modules/Editors/ProjectCenter/GNUmakefile
diff --git a/Framework/PCAddFilesPanel.m b/Framework/PCAddFilesPanel.m
index 3851c19..eae8da2 100644
--- a/Framework/PCAddFilesPanel.m
+++ b/Framework/PCAddFilesPanel.m
@@ -1,7 +1,7 @@
 /*
    GNUstep ProjectCenter - http://www.gnustep.org/experience/ProjectCenter.html
 
-   Copyright (C) 2004-2011 Free Software Foundation
+   Copyright (C) 2004-2014 Free Software Foundation
 
    Authors: Serg Stoyan
             Riccardo Mottola
@@ -107,9 +107,9 @@ static PCAddFilesPanel *addFilesPanel = nil;
 {
   NSString  *category = [fileTypePopup titleOfSelectedItem];
 
-  if ([_delegate respondsToSelector:@selector(categoryChangedTo:)])
+  if ([[self delegate] respondsToSelector:@selector(categoryChangedTo:)])
     {
-      [_delegate categoryChangedTo:category];
+      [[self delegate] categoryChangedTo:category];
     }
 }
 
diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m
index 22f95d3..8bd2743 100644
--- a/Framework/PCProjectBuilder.m
+++ b/Framework/PCProjectBuilder.m
@@ -873,7 +873,7 @@
   NSInteger position = 0;
   NSRange   range = NSMakeRange(position,1);
 
-  while ([[lineString substringFromRange:range] isEqualToString:@" "])
+  while ([[lineString substringWithRange:range] isEqualToString:@" "])
     {
       range.location = ++position;
     }