Fix bootstrap code.