Minor fixes
Bootstrapper, launcher, client