Fix clear_objects() and clear_volumes()