Work copy defects

A few more fixes for Works and Copies DSC-319, DSC-354