Add more stability with the bootstrap additions