Fix base processes not stopping

Change-Id: Ibb89403bbd2239cfbe693c6ae7b2cb398eb31477