Updates to CDC to fix issues with buffering and pasting