Fix the bootstrapper