BUG Fix additional bootstrapping issues