Some changes to handling command blocks while cloning