Small fixes to StaticObject