Fix build

First commit should be safe. I'm not so sure about the second one, please check if adding `Copy`is what we want there.