diff --git a/Make/makerules b/Make/makerules
index 5a525c395..36c5f3d1b 100644
--- a/Make/makerules
+++ b/Make/makerules
@@ -137,7 +137,15 @@ Makedepend : $(CXXFILES) $(CFILES)
 ifeq ($(OS),IRIX)   
 	touch $@
 else
-	$(C++) $(INC) $(DEPARG) $^ > $(MAKEDEPEND)
+	@ [ -d depend ] || mkdir depend
+	@ rm -f $@;
+	 for f in $?; do \
+	    ff=`basename $$f`;\
+	    $(C++) $(INC) $(DEPARG) > depend/$$ff ;\
+	    echo "include depend/$$ff" >> $@;\
+	done
+	
+#	$(C++) $(INC) $(DEPARG) $^ > $(MAKEDEPEND)
 endif
 
 
diff --git a/include/osg/NodeVisitor b/include/osg/NodeVisitor
index e71097426..f73bc7154 100644
--- a/include/osg/NodeVisitor
+++ b/include/osg/NodeVisitor
@@ -137,7 +137,7 @@ class SG_EXPORT NodeVisitor : public Referenced
             NodeVisitor has been attached via setTraverseVisitor()
             and the new mode is not TRAVERSE_VISITOR then the attached
             visitor is detached. Default mode is TRAVERSE_NONE.*/
-        void setTraversalMode(TraversalMode mode);
+        void setTraversalMode(const TraversalMode mode);
         
         /** Get the traversal mode.*/
         inline TraversalMode getTraversalMode() const { return _traversalMode; }
diff --git a/src/osg/TexGen.cpp b/src/osg/TexGen.cpp
index 8199f2ab4..f27cddb2b 100644
--- a/src/osg/TexGen.cpp
+++ b/src/osg/TexGen.cpp
@@ -18,7 +18,7 @@ TexGen::~TexGen()
 }
 
 
-void TexGen::setPlane(const Coord which, const Vec4& plane)
+void TexGen::setPlane(Coord which, const Vec4& plane)
 {
     switch( which )
     {
@@ -31,7 +31,7 @@ void TexGen::setPlane(const Coord which, const Vec4& plane)
 }
 
 
-const Vec4& TexGen::getPlane(const Coord which) const
+const Vec4& TexGen::getPlane(Coord which) const
 {
     switch( which )
     {
diff --git a/src/osgPlugins/logos/Makefile b/src/osgPlugins/logos/Makefile
index ccea33bfa..5ed797290 100644
--- a/src/osgPlugins/logos/Makefile
+++ b/src/osgPlugins/logos/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	ReaderWriterLOGO.cpp\
 
-LIBS  += $(OSG_LIBS) $(GL_LIBS) $(OTHER_LIBS)
+##LIBS  += $(OSG_LIBS) $(GL_LIBS) $(OTHER_LIBS)
 
 TARGET_BASENAME = logo
 include $(TOPDIR)/Make/cygwin_plugin_def
diff --git a/src/osgPlugins/logos/ReaderWriterLOGO.cpp b/src/osgPlugins/logos/ReaderWriterLOGO.cpp
index 750f30da8..897a3c95b 100644
--- a/src/osgPlugins/logos/ReaderWriterLOGO.cpp
+++ b/src/osgPlugins/logos/ReaderWriterLOGO.cpp
@@ -66,6 +66,7 @@ class Logos: public osg::Drawable
 	    sset->setAttribute( transp );
 	    sset->setMode( GL_BLEND, osg::StateAttribute::ON );
 	    sset->setMode( GL_DEPTH_TEST, osg::StateAttribute::OFF );
+	    sset->setTextureMode( 0, GL_TEXTURE_2D, osg::StateAttribute::OFF );
 	    sset->setRenderBinDetails( StateSet::TRANSPARENT_BIN + 1 , "RenderBin" );
 	    setStateSet( sset );
 	    viewport = new osg::Viewport;
@@ -100,6 +101,8 @@ class Logos: public osg::Drawable
     	    glPushMatrix();
     	    glLoadIdentity();
 
+	    glColor4f( 1, 1, 1, 1 );
+
 	    std::vector <osg::Image *>::const_iterator p;
 	    float th = 0.0;
 	    for( p = logos[Center].begin(); p != logos[Center].end(); p++ )
diff --git a/src/osgPlugins/osg/Makefile b/src/osgPlugins/osg/Makefile
index ad4b611ba..fd4d8b6f8 100644
--- a/src/osgPlugins/osg/Makefile
+++ b/src/osgPlugins/osg/Makefile
@@ -56,7 +56,8 @@ CXXFILES =\
         Transform.cpp\
 
 
-LIBS   += $(OSG_LIBS) $(OTHER_LIBS)
+###LIBS   += $(OSG_LIBS) $(OTHER_LIBS)
+LIBS = -losg -lCstd
 
 TARGET_BASENAME = osg
 include $(TOPDIR)/Make/cygwin_plugin_def
diff --git a/src/osgPlugins/rgb/Makefile b/src/osgPlugins/rgb/Makefile
index d7a0639f0..72f8742a9 100644
--- a/src/osgPlugins/rgb/Makefile
+++ b/src/osgPlugins/rgb/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	ReaderWriterRGB.cpp\
 
-LIBS  += $(OSG_LIBS) $(OTHER_LIBS)
+##LIBS  += $(OSG_LIBS) $(OTHER_LIBS)
 
 TARGET_BASENAME = rgb
 include $(TOPDIR)/Make/cygwin_plugin_def