Fix up bootstrappiness