Fix bootstrapping