Updates to correct unintended behavior of copy and paste functions