diff --git a/src/osgGA/Widget.cpp b/src/osgGA/Widget.cpp
index e8f22769f..140f95862 100644
--- a/src/osgGA/Widget.cpp
+++ b/src/osgGA/Widget.cpp
@@ -306,5 +306,6 @@ void Widget::createGraphicsImplementation()
 
 osg::BoundingSphere Widget::computeBound() const
 {
-    return osg::BoundingSphere(_extents);
+    if (_extents.valid()) return osg::BoundingSphere(_extents);
+    else return osg::Group::computeBound();
 }
diff --git a/src/osgPlugins/lua/LuaScriptEngine.cpp b/src/osgPlugins/lua/LuaScriptEngine.cpp
index 496d1dcad..fd2c59954 100644
--- a/src/osgPlugins/lua/LuaScriptEngine.cpp
+++ b/src/osgPlugins/lua/LuaScriptEngine.cpp
@@ -2004,7 +2004,7 @@ public:
 
     PushStackValueVisitor(const LuaScriptEngine* lse) : _lse(lse) { _lua = const_cast<LuaScriptEngine*>(lse)->getLuaState(); }
 
-    virtual void apply(bool value)                      { lua_pushboolean(_lua, value ? 0 : 1); }
+    virtual void apply(bool value)                      { lua_pushboolean(_lua, value ? 1 : 0); }
     virtual void apply(char value)                      { lua_pushnumber(_lua, value); }
     virtual void apply(unsigned char value)             { lua_pushnumber(_lua, value); }
     virtual void apply(short value)                     { lua_pushnumber(_lua, value); }
@@ -2993,15 +2993,30 @@ int LuaScriptEngine::setPropertyFromStack(osg::Object* object, const std::string
         if (lua_type(_lua,-1)==LUA_TFUNCTION)
         {
             int ref = luaL_ref(_lua, LUA_REGISTRYINDEX);
-
             osg::ref_ptr<LuaCallbackObject> lco = new LuaCallbackObject(propertyName, this, ref);
-            object->getOrCreateUserDataContainer()->addUserObject(lco.get());
+
+            osg::UserDataContainer* udc = object->getOrCreateUserDataContainer();
+            unsigned int objectIndex = udc->getUserObjectIndex(propertyName);
+            if (objectIndex < udc->getNumUserObjects())
+            {
+                udc->setUserObject(objectIndex, lco.get());
+            }
+            else
+            {
+                udc->addUserObject(lco.get());
+            }
+
             return 0;
         }
 
         type = LuaScriptEngine::getType(-1);
     }
 
+    return setPropertyFromStack(object, propertyName, type);
+}
+
+int LuaScriptEngine::setPropertyFromStack(osg::Object* object, const std::string& propertyName, osgDB::BaseSerializer::Type type) const
+{
     switch(type)
     {
         case(osgDB::BaseSerializer::RW_BOOL):
@@ -3266,11 +3281,6 @@ int LuaScriptEngine::setPropertyFromStack(osg::Object* object, const std::string
             }
             break;
         }
-        case(osgDB::BaseSerializer::RW_LIST):
-        {
-            OSG_NOTICE<<"Need to implement RW_LIST support"<<std::endl;
-            break;
-        }
         case(osgDB::BaseSerializer::RW_IMAGE):
         case(osgDB::BaseSerializer::RW_OBJECT):
         {
@@ -3306,6 +3316,7 @@ int LuaScriptEngine::setPropertyFromStack(osg::Object* object, const std::string
             }
             break;
         }
+        case(osgDB::BaseSerializer::RW_LIST):
         default:
             break;
     }
@@ -3420,27 +3431,22 @@ osgDB::BaseSerializer::Type LuaScriptEngine::getType(int pos) const
 
             if ((numStringKeys==2 || numNumberKeys==2) && (numNumberFields==2))
             {
-                OSG_NOTICE<<"Could be Vec2d"<<std::endl;
                 return osgDB::BaseSerializer::RW_VEC2D;
             }
             else if ((numStringKeys==3 || numNumberKeys==3) && (numNumberFields==3))
             {
-                OSG_NOTICE<<"Could be Vec3d"<<std::endl;
                 return osgDB::BaseSerializer::RW_VEC3D;
             }
             else if ((numStringKeys==4 || numNumberKeys==4) && (numNumberFields==4))
             {
-                OSG_NOTICE<<"Could be Vec4d"<<std::endl;
                 return osgDB::BaseSerializer::RW_VEC4D;
             }
             else if ((numNumberKeys==16) && (numNumberFields==16))
             {
-                OSG_NOTICE<<"Could be Matrixd"<<std::endl;
                 return osgDB::BaseSerializer::RW_MATRIXD;
             }
             else if ((numNumberKeys==6) && (numNumberFields==6))
             {
-                OSG_NOTICE<<"Could be BoundingBoxd"<<std::endl;
                 return osgDB::BaseSerializer::RW_BOUNDINGBOXD;
             }
             // not supported
diff --git a/src/osgPlugins/lua/LuaScriptEngine.h b/src/osgPlugins/lua/LuaScriptEngine.h
index f715b5281..845b35476 100644
--- a/src/osgPlugins/lua/LuaScriptEngine.h
+++ b/src/osgPlugins/lua/LuaScriptEngine.h
@@ -105,6 +105,7 @@ class LuaScriptEngine : public osg::ScriptEngine
 
         int pushPropertyToStack(osg::Object* object, const std::string& propertyName) const;
         int setPropertyFromStack(osg::Object* object, const std::string& propertyName) const;
+        int setPropertyFromStack(osg::Object* object, const std::string& propertyName, osgDB::BaseSerializer::Type type) const;
 
         bool loadScript(osg::Script* script);
 
diff --git a/src/osgWrappers/serializers/osg/Switch.cpp b/src/osgWrappers/serializers/osg/Switch.cpp
index 961410ca2..3d0108f88 100644
--- a/src/osgWrappers/serializers/osg/Switch.cpp
+++ b/src/osgWrappers/serializers/osg/Switch.cpp
@@ -11,7 +11,6 @@ struct SwitchGetValue : public osgDB::MethodObject
         if (inputParameters.empty()) return false;
 
         osg::Object* indexObject = inputParameters[0].get();
-        OSG_NOTICE<<"SwitchGetValue "<<indexObject->className()<<std::endl;
 
         unsigned int index = 0;
         osg::DoubleValueObject* dvo = dynamic_cast<osg::DoubleValueObject*>(indexObject);
@@ -37,7 +36,6 @@ struct SwitchSetValue : public osgDB::MethodObject
         if (inputParameters.size()<2) return false;
 
         osg::Object* indexObject = inputParameters[0].get();
-        OSG_NOTICE<<"SwitchSetValue "<<indexObject->className()<<std::endl;
 
         unsigned int index = 0;
         osg::DoubleValueObject* dvo = dynamic_cast<osg::DoubleValueObject*>(indexObject);
@@ -49,17 +47,31 @@ struct SwitchSetValue : public osgDB::MethodObject
         }
 
         bool enabled = false;
-        indexObject = inputParameters[1].get();
-        dvo = dynamic_cast<osg::DoubleValueObject*>(indexObject);
-        if (dvo) enabled = dvo->getValue()!=0.0;
+        osg::Object* valueObject = inputParameters[1].get();
+        if (!valueObject) return false;
+
+        dvo = dynamic_cast<osg::DoubleValueObject*>(valueObject);
+        if (dvo)
+        {
+            enabled = dvo->getValue()!=0.0;
+        }
         else
         {
-            osg::UIntValueObject* uivo = dynamic_cast<osg::UIntValueObject*>(indexObject);
-            if (uivo) enabled = uivo->getValue()!=0;
+            osg::UIntValueObject* uivo = dynamic_cast<osg::UIntValueObject*>(valueObject);
+            if (uivo)
+            {
+                enabled = uivo->getValue()!=0;
+            }
+            else
+            {
+                osg::BoolValueObject* bo = dynamic_cast<osg::BoolValueObject*>(valueObject);
+                if (bo)
+                {
+                    enabled = bo->getValue();
+                }
+            }
         }
 
-        OSG_NOTICE<<"switch->setValue("<<index<<", "<<enabled<<")"<<std::endl;
-
         osg::Switch* sw = reinterpret_cast<osg::Switch*>(objectPtr);
         sw->setValue(index, enabled);