Resolved some CA2000 warnings
Fixed regression from previous commit
Data should be copied on construction