diff --git a/Make/makedefs.irix.std b/Make/makedefs.irix.std
index 8ee008903..988837388 100644
--- a/Make/makedefs.irix.std
+++ b/Make/makedefs.irix.std
@@ -20,7 +20,7 @@ LDFLAGS = -O2 -n32 -LANG:std -OPT:Olimit=0
 	$(C++) $(C++FLAGS) -c $<
 
 DYNAMICLIBRARYLIB = 
-PFLIBS = -lpfdu -lpfutil -lpf -limage
+PFLIBS = -L/usr/lib32/libpfdb -rpath /usr/lib32/libpfdb -lpfpfb -lpfdu -lpfutil -lpf -limage
 GLUTLIB = -lglut
 
 #
diff --git a/src/osgPlugins/flt/GeoSetBuilder.cpp b/src/osgPlugins/flt/GeoSetBuilder.cpp
index cd09715af..cb66448eb 100644
--- a/src/osgPlugins/flt/GeoSetBuilder.cpp
+++ b/src/osgPlugins/flt/GeoSetBuilder.cpp
@@ -596,7 +596,7 @@ void TmpGeoSet::setVertex(osg::GeoSet* gset, int index, Record* vertex)
             {
                 osg::Vec4* colors = gset->getColors();
                 ColorPool* pColorPool = _pFltFile->getColorPool();
-                if (pColorPool && (pVert->color_index >= 0))
+                if (pColorPool)
                     colors[index] = pColorPool->getColor(pVert->color_index);
                 else
                     colors[index] = _appearance.getFaceColor();
@@ -631,7 +631,7 @@ void TmpGeoSet::setVertex(osg::GeoSet* gset, int index, Record* vertex)
             {
                 osg::Vec4* colors = gset->getColors();
                 ColorPool* pColorPool = _pFltFile->getColorPool();
-                if (pColorPool && (pVert->color_index >= 0))
+                if (pColorPool)
                     colors[index] = pColorPool->getColor(pVert->color_index);
                 else
                     colors[index] = _appearance.getFaceColor();
diff --git a/src/osgPlugins/flt/ReaderWriterFLT.h b/src/osgPlugins/flt/ReaderWriterFLT.h
index d930d5bde..efb806dc0 100644
--- a/src/osgPlugins/flt/ReaderWriterFLT.h
+++ b/src/osgPlugins/flt/ReaderWriterFLT.h
@@ -54,8 +54,8 @@ public:
         return osgDB::equalCaseInsensitive(extension,"flt");
     }
 
-    virtual osg::Object* readObject(const std::string& fileName, const ReaderWriter::Options*);
-    virtual osg::Node* readNode(const std::string& fileName, const ReaderWriter::Options*);
+    virtual osg::Object* readObject(const std::string& fileName, const osgDB::ReaderWriter::Options*);
+    virtual osg::Node* readNode(const std::string& fileName, const osgDB::ReaderWriter::Options*);
 };
 
 
diff --git a/src/osgPlugins/pfb/Makefile b/src/osgPlugins/pfb/Makefile
index a8574b937..020810ec6 100644
--- a/src/osgPlugins/pfb/Makefile
+++ b/src/osgPlugins/pfb/Makefile
@@ -10,12 +10,7 @@ C++FILES = \
 
 LIB = ../../../lib/osgPlugins/osgdb_pfb.so
 
-LIBS = \
-	/usr/lib/Performer/Static/libpfdb/libpfpfb.a\
-        /usr/lib/Performer/Static/libpfdu.a\
-        /usr/lib/Performer/Static/libpfutil.a\
-	/usr/lib/Performer/Static/libpf.a\
-	-losg -losgDB
+LIBS = -losg -losgDB $(PFLIBS)
 
 TARGET_LOADER_FILES = osgPlugins/osgdb_pfb.so