More fixes for multiple local copy issues