raid: more updates to fix rejoin preventing exit