Fixed some problems with the bootstrap