Fixed copy/paste issues that were driving me nuts!