[FOLD] AbstractObject fixes