Getting changes from jwvdiermen fork for process leaks (and other niceties)