Updates to fix key copy issues.