Finish of a debug session needs cleanup (#1) but fixes (#2) ish