-Fix a couple clone issues