Adaptations to bootstrap