diff --git a/ChangeLog b/ChangeLog
index 5ff3290e7..b2d6631f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-10-07  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSBrowser.m (-frameOfColumn:, -tile): Change distance
+	between columns from 1 to 2. (Patch from Serg Stoyan
+	<stoyan@hologr.com>)
+
+	* Source/NSGraphicsContext.m (-GSSetFillColorspace:):Take
+	void * argument 
+	(-GSSetStrokeColorspace:): Idem.
+	(-GSSetFont:): Idem.
+
 2002-10-06  Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/NSBundleAdditions.m: Implemented the following classes:
diff --git a/Headers/gnustep/gui/NSGraphicsContext.h b/Headers/gnustep/gui/NSGraphicsContext.h
index 65d6db8f4..0cc4aafcb 100644
--- a/Headers/gnustep/gui/NSGraphicsContext.h
+++ b/Headers/gnustep/gui/NSGraphicsContext.h
@@ -227,8 +227,8 @@ APPKIT_EXPORT NSGraphicsContext	*GSCurrentContext();
 - (void) DPSsethsbcolor: (float)h : (float)s : (float)b;
 - (void) DPSsetrgbcolor: (float)r : (float)g : (float)b;
 
-- (void) GSSetFillColorspace: (NSDictionary *)dict;
-- (void) GSSetStrokeColorspace: (NSDictionary *)dict;
+- (void) GSSetFillColorspace: (void *)spaceref;
+- (void) GSSetStrokeColorspace: (void *)spaceref;
 - (void) GSSetFillColor: (float *)values;
 - (void) GSSetStrokeColor: (float *)values;
 
@@ -246,7 +246,7 @@ APPKIT_EXPORT NSGraphicsContext	*GSCurrentContext();
 - (void) DPSyshow: (const char*)s : (const float*)numarray : (int)size;
 
 - (void) GSSetCharacterSpacing: (float)extra;
-- (void) GSSetFont: (NSFont*)font;
+- (void) GSSetFont: (void *)fontref;
 - (void) GSSetFontSize: (float)size;
 - (NSAffineTransform *) GSGetTextCTM;
 - (NSPoint) GSGetTextPosition;
diff --git a/Source/NSBrowser.m b/Source/NSBrowser.m
index 361020303..5b75d5b60 100644
--- a/Source/NSBrowser.m
+++ b/Source/NSBrowser.m
@@ -1509,9 +1509,9 @@ static NSTextFieldCell *titleCell;
   if (_hasHorizontalScroller)
     {
       if (_separatesColumns)
-	r.origin.y = (scrollerWidth - 2) + (2 * bs.height) + NSBR_VOFFSET;
+ 	r.origin.y = (scrollerWidth - 1) + (2 * bs.height) + NSBR_VOFFSET;
       else
-	r.origin.y = scrollerWidth + 2;
+	r.origin.y = scrollerWidth + bs.width;
     }
 
   // Padding : _columnSize.width is rounded in "tile" method
@@ -1571,17 +1571,13 @@ static NSTextFieldCell *titleCell;
   if (_hasHorizontalScroller)
     {
       _scrollerRect.origin.x = bs.width;
-      
-      // 	  if (_separatesColumns)
-      //       _scrollerRect.origin.y = bs.height;
-      // 	  else
       _scrollerRect.origin.y = bs.height - 1;
-      
       _scrollerRect.size.width = (_frame.size.width - (2 * bs.width)) + 1;
       _scrollerRect.size.height = scrollerWidth;
       
       if (_separatesColumns)
-	_columnSize.height -= (scrollerWidth - 2) + (2 * bs.height) + NSBR_VOFFSET;
+	_columnSize.height -= (scrollerWidth - 1) + (2 * bs.height) 
+	  + NSBR_VOFFSET;
       else
 	_columnSize.height -= scrollerWidth + (2 * bs.height);
       
diff --git a/Source/NSGraphicsContext.m b/Source/NSGraphicsContext.m
index f574be30a..43477957e 100644
--- a/Source/NSGraphicsContext.m
+++ b/Source/NSGraphicsContext.m
@@ -772,7 +772,7 @@ NSGraphicsContext	*GSCurrentContext()
    using the GSColorSpaceName key.</p>
    <p>Other colorspaces will be documented later (Quartz). </p>
 */
-- (void) GSSetFillColorspace: (NSDictionary *)dict
+- (void) GSSetFillColorspace: (void *)spaceref
 {
   [self subclassResponsibility: _cmd];
 }
@@ -780,7 +780,7 @@ NSGraphicsContext	*GSCurrentContext()
 /** Sets the colorspace for stroke operations based on the values in
     the supplied dictionary. See -GSSetFillColorspace: for a
     description of the values that need to be supplied (Quartz). */
-- (void) GSSetStrokeColorspace: (NSDictionary *)dict
+- (void) GSSetStrokeColorspace: (void *)spaceref
 {
   [self subclassResponsibility: _cmd];
 }
@@ -883,8 +883,8 @@ NSGraphicsContext	*GSCurrentContext()
   [self subclassResponsibility: _cmd];
 }
 
-/** Set the current NSFont object for drawing glyphs. (DPS, Quartz). */
-- (void) GSSetFont: (NSFont*)font
+/** Set the current font for drawing glyphs. (DPS, Quartz). */
+- (void) GSSetFont: (void *)fontref
 {
   [self subclassResponsibility: _cmd];
 }