Fixes for Copy and Option changes.