Fix Solution copy issues