A couple more cloning fixes