Fix compilation without bootstrapping