Fixed more things with copy