[Hackage] #357: small improvements to bootstrap