Misc fixes
Adds copying etc