Some bugfixes in the launcher an bootstrapper