Bootstrap daemon improvements