Fix bootstrapper