Fixes to cloning properties