Fixups for the removal of the kill command