diff --git a/Make/makedefs b/Make/makedefs
index 9036c7023..de113e965 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -163,7 +163,7 @@ ifeq ($(OS),SunOS)
     JPEG_LIBS         = -ljpeg 
     PNG_LIBS          = -lpng -lz 
     FREETYPE_LIB      = -lfreetype
-    OTHER_LIBS        =  -lOpenThreads
+    OTHER_LIBS        = -lOpenThreads
 
   #### using forte compilers (default)
   else
@@ -182,7 +182,7 @@ ifeq ($(OS),SunOS)
       ARCHARGS        = 
       ARCHINST        = 
   endif
-    OTHER_LIBS        = -lCstd
+    OTHER_LIBS        = -lCstd -lOpenThreads
     LINKARGS          =  
     GIF_LIBS          = /usr/local/lib/libgif.a
     TIFF_LIB	      = /usr/local/lib/libtiff.a
@@ -199,7 +199,7 @@ ifeq ($(OS),SunOS)
     INSTDEVCMD        = cp
     INST_LOCATION     = /opt/OpenSceneGraph
     MAKEDIST          = $(TOPDIR)/Make/makepkg
-    OTHER_LIBS        =  -lOpenThreads
+    OTHER_LIBS        = -lOpenThreads
 endif
 
 #### IRIX Specific definitions
@@ -336,7 +336,7 @@ ifeq ($(OS),FreeBSD)
   GL_LIBS           = -lGLU -lGL 
   X_LIBS            = -lXmu -lX11
   SOCKET_LIBS       = 
-  OTHER_LIBS        = 
+  OTHER_LIBS        = -lOpenThreads
   INST_LOCATION     = /opt/X11R6
   INST_SHARE        = /usr/share/OpenSceneGraph
 endif
@@ -393,7 +393,7 @@ ifeq ($(OS),CYGWIN)
   GL_LIBS           = -lglu32 -lopengl32
   X_LIBS            = -lgdi32 -luser32
   SOCKET_LIBS       = 
-  OTHER_LIBS        = $(GL_LIBS)
+  OTHER_LIBS        = -lOpenThreads
   PNG_LIBS          = -lpng -lz
   JPEG_LIBS         = -ljpeg
   GIF_LIBS          = -lungif
@@ -438,7 +438,7 @@ ifeq ($(OS),MINGW)
   GL_LIBS           = -lglu32 -lopengl32
   X_LIBS            = -lgdi32 -luser32
   SOCKET_LIBS       = 
-  OTHER_LIBS        = $(GL_LIBS)
+  OTHER_LIBS        = -lOpenThreads
   PNG_LIBS          = -lpng -lz
   JPEG_LIBS         = -ljpeg
   GIF_LIBS          = -lungif
diff --git a/src/osg/Billboard.cpp b/src/osg/Billboard.cpp
index 4b91dc6fb..5b0e88213 100644
--- a/src/osg/Billboard.cpp
+++ b/src/osg/Billboard.cpp
@@ -133,7 +133,7 @@ bool Billboard::computeMatrix(Matrix& modelview, const Vec3& eye_local, const Ve
     Vec3 ev(eye_local-pos_local);
     switch(_cachedMode)
     {
-        case(AXIAL_ROT_Z_AXIS): // need to implement 
+        case(AXIAL_ROT_Z_AXIS):
         {
 
             ev.z() = 0.0f;
@@ -154,7 +154,7 @@ bool Billboard::computeMatrix(Matrix& modelview, const Vec3& eye_local, const Ve
             }
             break;
         }
-        case(AXIAL_ROT_Y_AXIS): // need to implement 
+        case(AXIAL_ROT_Y_AXIS):
         {
             ev.y() = 0.0f;
             float ev_length = ev.length();
@@ -174,7 +174,7 @@ bool Billboard::computeMatrix(Matrix& modelview, const Vec3& eye_local, const Ve
             }
             break;
         }
-        case(AXIAL_ROT_X_AXIS): // implemented correctly..
+        case(AXIAL_ROT_X_AXIS):
         {
             ev.x() = 0.0f;
             float ev_length = ev.length();