Scaffolding changes for Ctrl-C