Fixes in operations to adapt to shallow cloning