diff --git a/AppKit/Cib/CPCib.j b/AppKit/Cib/CPCib.j
index 6276fc0f0..ca70f97be 100644
--- a/AppKit/Cib/CPCib.j
+++ b/AppKit/Cib/CPCib.j
@@ -154,9 +154,6 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)data
 {
     _data = [CPData dataWithString:data];
-
-    if ([_loadDelegate respondsToSelector:@selector(cibDidFinishLoading:)])
-        [_loadDelegate cibDidFinishLoading:self];
 }
 
 - (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
@@ -168,6 +165,9 @@ var CPCibObjectDataKey  = @"CPCibObjectDataKey";
 
 - (void)connectionDidFinishLoading:(CPURLConnection)aConnection
 {
+    if ([_loadDelegate respondsToSelector:@selector(cibDidFinishLoading:)])
+        [_loadDelegate cibDidFinishLoading:self];
+
     _loadDelegate = nil;
 }
 
diff --git a/Rake/lib/objective-j.rb b/Rake/lib/objective-j.rb
index 307b1ba8b..a40435968 100644
--- a/Rake/lib/objective-j.rb
+++ b/Rake/lib/objective-j.rb
@@ -13,32 +13,6 @@ module ObjectiveJ
         BrowserDesktop  = 'browser-desktop'
         BrowserIPhone   = 'browser-iphone'
         BrowseriPhone   = 'browser-iphone'
-
-        PLATFORM_DIRECTORIES =
-        {
-            Platform::ObjJ              => 'objj.platform',
-            Platform::Rhino             => 'rhino.platform',
-            Platform::Browser           => 'browser.platform',
-            Platform::BrowserDesktop    => 'browser-desktop.platform',
-            Platform::BrowserIPhone     => 'browser-iphone.platform'
-        }
-
-        PLATFORM_FLAGS =
-        {
-            Platform::ObjJ              => [],
-            Platform::Rhino             => ['PLATFORM_RHINO'],
-            Platform::Browser           => ['PLATFORM_BROWSER', 'PLATFORM_DOM'],
-            Platform::BrowserDesktop    => ['PLATFORM_BROWSER', 'PLATFORM_DOM', 'PLATFORM_DESKTOP'],
-            Platform::BrowserIPhone     => ['PLATFORM_BROWSER', 'PLATFORM_DOM', 'PLATFORM_IPHONE', 'PLATFORM_MOBILE']
-        }
-
-        def Platform.directory(aPlatform)
-            return PLATFORM_DIRECTORIES[aPlatform]
-        end
-
-        def Platform.flags(aPlatform)
-            return PLATFORM_FLAGS[aPlatform]
-        end
     end
 
 end  # module ObjectiveJ
diff --git a/Tools/nib2cib/NSSecureTextField.j b/Tools/nib2cib/NSSecureTextField.j
index 74d6c68a5..d1d1ea5f9 100644
--- a/Tools/nib2cib/NSSecureTextField.j
+++ b/Tools/nib2cib/NSSecureTextField.j
@@ -1,3 +1,24 @@
+/*
+ * NSSecureTextField.j
+ * nib2cib
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 @import <AppKit/CPSecureTextField.j>
 
diff --git a/Tools/nib2cib/NSTextField.j b/Tools/nib2cib/NSTextField.j
index f83349718..ecd8af57b 100644
--- a/Tools/nib2cib/NSTextField.j
+++ b/Tools/nib2cib/NSTextField.j
@@ -1,8 +1,31 @@
+/*
+ * NSTextField.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
 @import <AppKit/CPTextField.j>
 
 @import "NSControl.j"
 @import "NSCell.j"
 
+
 @implementation CPTextField (NSCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder