Fixed bootstrapping failures (1)