Some unfinished QUIT-handling