Add missing changes.
Fix copy constructor signature