diff --git a/src/osgWrappers/osg/Uniform.cpp b/src/osgWrappers/osg/Uniform.cpp
index 13126eadf..afa2a2536 100644
--- a/src/osgWrappers/osg/Uniform.cpp
+++ b/src/osgWrappers/osg/Uniform.cpp
@@ -160,6 +160,7 @@ BEGIN_ENUM_REFLECTOR(osg::Uniform::Type)
 	I_EnumLabel(osg::Uniform::FLOAT_MAT4x3);
 	I_EnumLabel(osg::Uniform::SAMPLER_BUFFER);
 	I_EnumLabel(osg::Uniform::SAMPLER_CUBE_SHADOW);
+	I_EnumLabel(osg::Uniform::UNSIGNED_INT);
 	I_EnumLabel(osg::Uniform::UNSIGNED_INT_VEC2);
 	I_EnumLabel(osg::Uniform::UNSIGNED_INT_VEC3);
 	I_EnumLabel(osg::Uniform::UNSIGNED_INT_VEC4);
@@ -259,6 +260,10 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	               ____Uniform__C5_char_P1__int,
 	               "",
 	               "");
+	I_Constructor2(IN, const char *, name, IN, unsigned int, i,
+	               ____Uniform__C5_char_P1__unsigned_int,
+	               "",
+	               "");
 	I_Constructor2(IN, const char *, name, IN, bool, b,
 	               ____Uniform__C5_char_P1__bool,
 	               "",
@@ -303,6 +308,18 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	               ____Uniform__C5_char_P1__int__int__int__int,
 	               "",
 	               "");
+	I_Constructor3(IN, const char *, name, IN, unsigned int, i0, IN, unsigned int, i1,
+	               ____Uniform__C5_char_P1__unsigned_int__unsigned_int,
+	               "",
+	               "");
+	I_Constructor4(IN, const char *, name, IN, unsigned int, i0, IN, unsigned int, i1, IN, unsigned int, i2,
+	               ____Uniform__C5_char_P1__unsigned_int__unsigned_int__unsigned_int,
+	               "",
+	               "");
+	I_Constructor5(IN, const char *, name, IN, unsigned int, i0, IN, unsigned int, i1, IN, unsigned int, i2, IN, unsigned int, i3,
+	               ____Uniform__C5_char_P1__unsigned_int__unsigned_int__unsigned_int__unsigned_int,
+	               "",
+	               "");
 	I_Constructor3(IN, const char *, name, IN, bool, b0, IN, bool, b1,
 	               ____Uniform__C5_char_P1__bool__bool,
 	               "",
@@ -365,6 +382,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __bool__set__int,
 	          "",
 	          "");
+	I_Method1(bool, set, IN, unsigned int, i,
+	          Properties::NON_VIRTUAL,
+	          __bool__set__unsigned_int,
+	          "",
+	          "");
 	I_Method1(bool, set, IN, bool, b,
 	          Properties::NON_VIRTUAL,
 	          __bool__set__bool,
@@ -420,6 +442,21 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __bool__set__int__int__int__int,
 	          "",
 	          "");
+	I_Method2(bool, set, IN, unsigned int, i0, IN, unsigned int, i1,
+	          Properties::NON_VIRTUAL,
+	          __bool__set__unsigned_int__unsigned_int,
+	          "",
+	          "");
+	I_Method3(bool, set, IN, unsigned int, i0, IN, unsigned int, i1, IN, unsigned int, i2,
+	          Properties::NON_VIRTUAL,
+	          __bool__set__unsigned_int__unsigned_int__unsigned_int,
+	          "",
+	          "");
+	I_Method4(bool, set, IN, unsigned int, i0, IN, unsigned int, i1, IN, unsigned int, i2, IN, unsigned int, i3,
+	          Properties::NON_VIRTUAL,
+	          __bool__set__unsigned_int__unsigned_int__unsigned_int__unsigned_int,
+	          "",
+	          "");
 	I_Method2(bool, set, IN, bool, b0, IN, bool, b1,
 	          Properties::NON_VIRTUAL,
 	          __bool__set__bool__bool,
@@ -445,6 +482,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __bool__get__int_R1,
 	          "",
 	          "");
+	I_Method1(bool, get, IN, unsigned int &, i,
+	          Properties::NON_VIRTUAL,
+	          __bool__get__unsigned_int_R1,
+	          "",
+	          "");
 	I_Method1(bool, get, IN, bool &, b,
 	          Properties::NON_VIRTUAL,
 	          __bool__get__bool_R1,
@@ -500,6 +542,21 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __bool__get__int_R1__int_R1__int_R1__int_R1,
 	          "",
 	          "");
+	I_Method2(bool, get, IN, unsigned int &, i0, IN, unsigned int &, i1,
+	          Properties::NON_VIRTUAL,
+	          __bool__get__unsigned_int_R1__unsigned_int_R1,
+	          "",
+	          "");
+	I_Method3(bool, get, IN, unsigned int &, i0, IN, unsigned int &, i1, IN, unsigned int &, i2,
+	          Properties::NON_VIRTUAL,
+	          __bool__get__unsigned_int_R1__unsigned_int_R1__unsigned_int_R1,
+	          "",
+	          "");
+	I_Method4(bool, get, IN, unsigned int &, i0, IN, unsigned int &, i1, IN, unsigned int &, i2, IN, unsigned int &, i3,
+	          Properties::NON_VIRTUAL,
+	          __bool__get__unsigned_int_R1__unsigned_int_R1__unsigned_int_R1__unsigned_int_R1,
+	          "",
+	          "");
 	I_Method2(bool, get, IN, bool &, b0, IN, bool &, b1,
 	          Properties::NON_VIRTUAL,
 	          __bool__get__bool_R1__bool_R1,
@@ -525,6 +582,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __bool__setElement__unsigned_int__int,
 	          "",
 	          "");
+	I_Method2(bool, setElement, IN, unsigned int, index, IN, unsigned int, i,
+	          Properties::NON_VIRTUAL,
+	          __bool__setElement__unsigned_int__unsigned_int,
+	          "",
+	          "");
 	I_Method2(bool, setElement, IN, unsigned int, index, IN, bool, b,
 	          Properties::NON_VIRTUAL,
 	          __bool__setElement__unsigned_int__bool,
@@ -580,6 +642,21 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __bool__setElement__unsigned_int__int__int__int__int,
 	          "",
 	          "");
+	I_Method3(bool, setElement, IN, unsigned int, index, IN, unsigned int, i0, IN, unsigned int, i1,
+	          Properties::NON_VIRTUAL,
+	          __bool__setElement__unsigned_int__unsigned_int__unsigned_int,
+	          "",
+	          "");
+	I_Method4(bool, setElement, IN, unsigned int, index, IN, unsigned int, i0, IN, unsigned int, i1, IN, unsigned int, i2,
+	          Properties::NON_VIRTUAL,
+	          __bool__setElement__unsigned_int__unsigned_int__unsigned_int__unsigned_int,
+	          "",
+	          "");
+	I_Method5(bool, setElement, IN, unsigned int, index, IN, unsigned int, i0, IN, unsigned int, i1, IN, unsigned int, i2, IN, unsigned int, i3,
+	          Properties::NON_VIRTUAL,
+	          __bool__setElement__unsigned_int__unsigned_int__unsigned_int__unsigned_int__unsigned_int,
+	          "",
+	          "");
 	I_Method3(bool, setElement, IN, unsigned int, index, IN, bool, b0, IN, bool, b1,
 	          Properties::NON_VIRTUAL,
 	          __bool__setElement__unsigned_int__bool__bool,
@@ -605,6 +682,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __bool__getElement__unsigned_int__int_R1,
 	          "",
 	          "");
+	I_Method2(bool, getElement, IN, unsigned int, index, IN, unsigned int &, i,
+	          Properties::NON_VIRTUAL,
+	          __bool__getElement__unsigned_int__unsigned_int_R1,
+	          "",
+	          "");
 	I_Method2(bool, getElement, IN, unsigned int, index, IN, bool &, b,
 	          Properties::NON_VIRTUAL,
 	          __bool__getElement__unsigned_int__bool_R1,
@@ -660,6 +742,21 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __bool__getElement__unsigned_int__int_R1__int_R1__int_R1__int_R1,
 	          "",
 	          "");
+	I_Method3(bool, getElement, IN, unsigned int, index, IN, unsigned int &, i0, IN, unsigned int &, i1,
+	          Properties::NON_VIRTUAL,
+	          __bool__getElement__unsigned_int__unsigned_int_R1__unsigned_int_R1,
+	          "",
+	          "");
+	I_Method4(bool, getElement, IN, unsigned int, index, IN, unsigned int &, i0, IN, unsigned int &, i1, IN, unsigned int &, i2,
+	          Properties::NON_VIRTUAL,
+	          __bool__getElement__unsigned_int__unsigned_int_R1__unsigned_int_R1__unsigned_int_R1,
+	          "",
+	          "");
+	I_Method5(bool, getElement, IN, unsigned int, index, IN, unsigned int &, i0, IN, unsigned int &, i1, IN, unsigned int &, i2, IN, unsigned int &, i3,
+	          Properties::NON_VIRTUAL,
+	          __bool__getElement__unsigned_int__unsigned_int_R1__unsigned_int_R1__unsigned_int_R1__unsigned_int_R1,
+	          "",
+	          "");
 	I_Method3(bool, getElement, IN, unsigned int, index, IN, bool &, b0, IN, bool &, b1,
 	          Properties::NON_VIRTUAL,
 	          __bool__getElement__unsigned_int__bool_R1__bool_R1,
@@ -720,6 +817,11 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __bool__setArray__IntArray_P1,
 	          "",
 	          "");
+	I_Method1(bool, setArray, IN, osg::UIntArray *, array,
+	          Properties::NON_VIRTUAL,
+	          __bool__setArray__UIntArray_P1,
+	          "",
+	          "");
 	I_Method0(osg::FloatArray *, getFloatArray,
 	          Properties::NON_VIRTUAL,
 	          __FloatArray_P1__getFloatArray,
@@ -740,6 +842,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	          __C5_IntArray_P1__getIntArray,
 	          "",
 	          "");
+	I_Method0(osg::UIntArray *, getUIntArray,
+	          Properties::NON_VIRTUAL,
+	          __UIntArray_P1__getUIntArray,
+	          "Get the internal data array for an unsigned int osg::Uniform. ",
+	          "");
+	I_Method0(const osg::UIntArray *, getUIntArray,
+	          Properties::NON_VIRTUAL,
+	          __C5_UIntArray_P1__getUIntArray,
+	          "",
+	          "");
 	I_Method1(void, setModifiedCount, IN, unsigned int, mc,
 	          Properties::NON_VIRTUAL,
 	          __void__setModifiedCount__unsigned_int,
@@ -849,6 +961,9 @@ BEGIN_OBJECT_REFLECTOR(osg::Uniform)
 	I_SimpleProperty(osg::Uniform::Type, Type, 
 	                 __Type__getType, 
 	                 __bool__setType__Type);
+	I_SimpleProperty(osg::UIntArray *, UIntArray, 
+	                 __UIntArray_P1__getUIntArray, 
+	                 0);
 	I_SimpleProperty(osg::Uniform::Callback *, UpdateCallback, 
 	                 __Callback_P1__getUpdateCallback, 
 	                 __void__setUpdateCallback__Callback_P1);
diff --git a/src/osgWrappers/osgUtil/Optimizer.cpp b/src/osgWrappers/osgUtil/Optimizer.cpp
index ccfd52948..8d0918579 100644
--- a/src/osgWrappers/osgUtil/Optimizer.cpp
+++ b/src/osgWrappers/osgUtil/Optimizer.cpp
@@ -339,10 +339,16 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::Optimizer::FlattenStaticTransformsDuplicatingSha
 	          __void__apply__osg_Billboard_R1,
 	          "",
 	          "");
-	I_ProtectedMethod1(void, transformDrawables, IN, osg::Geode &, geode,
+	I_ProtectedMethod1(void, transformGeode, IN, osg::Geode &, geode,
 	                   Properties::NON_VIRTUAL,
 	                   Properties::NON_CONST,
-	                   __void__transformDrawables__osg_Geode_R1,
+	                   __void__transformGeode__osg_Geode_R1,
+	                   "",
+	                   "");
+	I_ProtectedMethod1(void, transformDrawable, IN, osg::Drawable &, drawable,
+	                   Properties::NON_VIRTUAL,
+	                   Properties::NON_CONST,
+	                   __void__transformDrawable__osg_Drawable_R1,
 	                   "",
 	                   "");
 	I_ProtectedMethod1(void, transformBillboard, IN, osg::Billboard &, billboard,