diff --git a/AppKit/CPRadio.j b/AppKit/CPRadio.j
index 3fef28d02..0a47ee937 100644
--- a/AppKit/CPRadio.j
+++ b/AppKit/CPRadio.j
@@ -98,7 +98,7 @@
     
     if (self)
     {
-        [self setRadioGroup:aRadioGroup || [CPRadioGroup new]];
+        [self setRadioGroup:aRadioGroup];
 
         [self setHighlightsBy:CPContentsCellMask];
         [self setShowsStateBy:CPContentsCellMask];
@@ -115,7 +115,7 @@
 
 - (id)initWithFrame:(CGRect)aFrame
 {
-    return [self initWithFrame:aFrame radioGroup:nil];
+    return [self initWithFrame:aFrame radioGroup:[CPRadioGroup new]];
 }
 
 - (CPInteger)nextState
diff --git a/Objective-J/CommonJS/lib/objective-j/jake/bundletask.js b/Objective-J/CommonJS/lib/objective-j/jake/bundletask.js
index 0e0e3fa6b..115e02ac8 100644
--- a/Objective-J/CommonJS/lib/objective-j/jake/bundletask.js
+++ b/Objective-J/CommonJS/lib/objective-j/jake/bundletask.js
@@ -388,6 +388,16 @@ BundleTask.prototype.defineInfoPlistTask = function()
     if (infoPlistPath && FILE.exists(infoPlistPath))
         filedir (infoPlistProductPath, [infoPlistPath]);
 
+    // FIXME: ? We do this because adding a .j file should cause Info.plist to be updated.
+    // Any better way to handle this? Perhaps this should happen unconditionally.
+    this.flattenedEnvironments().forEach(function(/*Environment*/ anEnvironment)
+    {
+        if (!anEnvironment.spritesImages())
+            return;
+
+        filedir (infoPlistProductPath, this.buildProductStaticPathForEnvironment(anEnvironment));
+    }, this);
+
     this.enhance([infoPlistProductPath]);
 }