diff --git a/ChangeLog b/ChangeLog
index d138ecb5f..b85d36c5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-04-14  Adam Fedor  <fedor@gnu.org>
+
+	* Headers/gnustep/gui/NSScreen.h: Add initializer.
+	* Source/NSScreen.m (initWithDeviceDescription:): New method to
+	make it easier to determine screen information.
+
+	* Source/NSBundleAdditions.m (+loadNibFile:): Fix unarchiver
+	method name.
+
 Wed Apr 14 16:58:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	Applied changes by Tim.Bissell@dresdnerkb.com -
diff --git a/Headers/gnustep/gui/NSScreen.h b/Headers/gnustep/gui/NSScreen.h
index f21271411..aba881f8a 100644
--- a/Headers/gnustep/gui/NSScreen.h
+++ b/Headers/gnustep/gui/NSScreen.h
@@ -63,4 +63,11 @@
 
 @end
 
+#ifndef NO_GNUSTEP
+// Need this definition for backend classes
+@interface NSScreen (GNUstep)
+- initWithDeviceDescription: (NSDictionary *)dict;
+@end
+#endif
+
 #endif // _GNUstep_H_NSScreen
diff --git a/Source/NSBundleAdditions.m b/Source/NSBundleAdditions.m
index 528c677f8..ec5343493 100644
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@@ -60,7 +60,7 @@
     {
       NSUnarchiver	*unarchiver;
 
-      unarchiver = [[NSUnarchiver alloc] initWithData: data];
+      unarchiver = [[NSUnarchiver alloc] initForReadingWithData: data];
       if (unarchiver)
 	{
 	  id	obj;
diff --git a/Source/NSScreen.m b/Source/NSScreen.m
index 540932799..3493637d7 100644
--- a/Source/NSScreen.m
+++ b/Source/NSScreen.m
@@ -53,10 +53,15 @@ NSScreen *mainScreen = nil;
 //
 + (NSScreen *)mainScreen
 {
-	if (!mainScreen)
-		mainScreen = [[NSScreen alloc] init];
-
-	return mainScreen;
+  NSMutableDictionary *dict;
+  
+  if (mainScreen)
+    return mainScreen; 
+  
+  dict = [NSMutableDictionary dictionary];
+  [dict setObject: @"Main" forKey: @"NSScreenKeyName"];
+  mainScreen = [[NSScreen alloc] initWithDeviceDescription: dict];
+  return mainScreen;
 }
 
 + (NSScreen *)deepestScreen
@@ -72,14 +77,21 @@ NSScreen *mainScreen = nil;
 //
 // Instance methods
 //
+- initWithDeviceDescription: (NSDictionary *)dict
+{
+  [super init];
+  depth = 0;
+  frame = NSZeroRect;
+  if (dict)
+    device_desc = [dict mutableCopy];
+  else
+    device_desc = [[NSMutableDictionary dictionary] retain];
+  return self;
+}
+
 - init
 {
-	[super init];				// Create our device description dictionary
-								// The backend will have to fill the dictionary
-	device_desc = [NSMutableDictionary dictionary];
-    depth = 0;
-    frame = NSZeroRect;
-	return self;
+  return [self initWithDeviceDescription: NULL];
 }
 
 //