Fixed some bootstrap