diff --git a/genwrapper.conf b/genwrapper.conf
index f0a957d25..7f3a560f0 100644
--- a/genwrapper.conf
+++ b/genwrapper.conf
@@ -137,6 +137,10 @@ suppress reflector "osg::MixinVector< GLubyte >"
 suppress reflector "osg::MixinVector< GLushort >"
 suppress reflector "osg::MixinVector< GLuint >"
 
+suppress reflector "OpenThreads::Atomic"
+suppress reflector "OpenThreads::AtomicPtr"
+
+
 #############################################################################
 
 # StateSet and related types need some advanced tweaking
@@ -249,14 +253,6 @@ configure reflector "osg::GraphicsContext"
 	abstract-object-type
 end
 
-configure reflector "OpenThreads::Atomic"
-    object-type
-end
-
-configure reflector "OpenThreads::AtomicPtr"
-    object-type
-end
-
 #############################################################################
 
 # Suppress nested nested class method
diff --git a/src/osgWrappers/OpenThreads/Atomic.cpp b/src/osgWrappers/OpenThreads/Atomic.cpp
index 2b06b6e6f..610806350 100644
--- a/src/osgWrappers/OpenThreads/Atomic.cpp
+++ b/src/osgWrappers/OpenThreads/Atomic.cpp
@@ -20,12 +20,3 @@
 #undef OUT
 #endif
 
-BEGIN_OBJECT_REFLECTOR(OpenThreads::Atomic)
-	I_DeclaringFile("OpenThreads/Atomic");
-	I_ConstructorWithDefaults1(IN, unsigned, value, 0,
-	                           Properties::NON_EXPLICIT,
-	                           ____Atomic__unsigned,
-	                           "",
-	                           "");
-END_REFLECTOR
-
diff --git a/src/osgWrappers/osg/GraphicsContext.cpp b/src/osgWrappers/osg/GraphicsContext.cpp
index 06c3a12b6..2e5909c66 100644
--- a/src/osgWrappers/osg/GraphicsContext.cpp
+++ b/src/osgWrappers/osg/GraphicsContext.cpp
@@ -492,6 +492,7 @@ BEGIN_OBJECT_REFLECTOR(osg::GraphicsContext::Traits)
 	I_PublicMemberProperty(osg::GraphicsContext *, sharedContext);
 	I_PublicMemberProperty(osg::ref_ptr< osg::Referenced >, inheritedWindowData);
 	I_PublicMemberProperty(bool, setInheritedWindowPixelFormat);
+	I_PublicMemberProperty(bool, overrideRedirect);
 END_REFLECTOR
 
 BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::GraphicsContext::WindowingSystemInterface)
diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp
index c4e6dadd0..a3adafe7e 100644
--- a/src/osgWrappers/osgUtil/Optimizer.cpp
+++ b/src/osgWrappers/osgUtil/Optimizer.cpp
@@ -86,6 +86,7 @@ BEGIN_ENUM_REFLECTOR(osgUtil::Optimizer::OptimizationOptions)
 	I_EnumLabel(osgUtil::Optimizer::FLATTEN_BILLBOARDS);
 	I_EnumLabel(osgUtil::Optimizer::TEXTURE_ATLAS_BUILDER);
 	I_EnumLabel(osgUtil::Optimizer::STATIC_OBJECT_DETECTION);
+	I_EnumLabel(osgUtil::Optimizer::FLATTEN_STATIC_TRANSFORMS_DUPLICATING_SHARED_SUBGRAPHS);
 	I_EnumLabel(osgUtil::Optimizer::DEFAULT_OPTIMIZATIONS);
 	I_EnumLabel(osgUtil::Optimizer::ALL_OPTIMIZATIONS);
 END_REFLECTOR
@@ -300,6 +301,58 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenBillboardVisitor)
 	I_PublicMemberProperty(osgUtil::Optimizer::FlattenBillboardVisitor::BillboardNodePathMap, _billboards);
 END_REFLECTOR
 
+BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenStaticTransformsDuplicatingSharedSubgraphsVisitor)
+	I_DeclaringFile("osgUtil/Optimizer");
+	I_BaseType(osgUtil::BaseOptimizerVisitor);
+	I_ConstructorWithDefaults1(IN, osgUtil::Optimizer *, optimizer, 0,
+	                           Properties::NON_EXPLICIT,
+	                           ____FlattenStaticTransformsDuplicatingSharedSubgraphsVisitor__Optimizer_P1,
+	                           "",
+	                           "");
+	I_Method0(void, reset,
+	          Properties::VIRTUAL,
+	          __void__reset,
+	          "Method to call to reset visitor. ",
+	          "Useful if your visitor accumulates state during a traversal, and you plan to reuse the visitor. To flush that state for the next traversal: call reset() prior to each traversal. ");
+	I_Method1(void, apply, IN, osg::Group &, group,
+	          Properties::VIRTUAL,
+	          __void__apply__osg_Group_R1,
+	          "",
+	          "");
+	I_Method1(void, apply, IN, osg::Transform &, transform,
+	          Properties::VIRTUAL,
+	          __void__apply__osg_Transform_R1,
+	          "",
+	          "");
+	I_Method1(void, apply, IN, osg::LOD &, lod,
+	          Properties::VIRTUAL,
+	          __void__apply__osg_LOD_R1,
+	          "",
+	          "");
+	I_Method1(void, apply, IN, osg::Geode &, geode,
+	          Properties::VIRTUAL,
+	          __void__apply__osg_Geode_R1,
+	          "",
+	          "");
+	I_Method1(void, apply, IN, osg::Billboard &, billboard,
+	          Properties::VIRTUAL,
+	          __void__apply__osg_Billboard_R1,
+	          "",
+	          "");
+	I_ProtectedMethod1(void, transformDrawables, IN, osg::Geode &, geode,
+	                   Properties::NON_VIRTUAL,
+	                   Properties::NON_CONST,
+	                   __void__transformDrawables__osg_Geode_R1,
+	                   "",
+	                   "");
+	I_ProtectedMethod1(void, transformBillboard, IN, osg::Billboard &, billboard,
+	                   Properties::NON_VIRTUAL,
+	                   Properties::NON_CONST,
+	                   __void__transformBillboard__osg_Billboard_R1,
+	                   "",
+	                   "");
+END_REFLECTOR
+
 BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenStaticTransformsVisitor)
 	I_DeclaringFile("osgUtil/Optimizer");
 	I_BaseType(osgUtil::BaseOptimizerVisitor);