Fixing up bootstrapping