Update bootstrapping for latest Q