Fixing changeobject bugs