fix bunch of issues faced during bootstrapping a new clone