Bootstrap fixup