Fix bootstrap and configuration file