Some changes for the bootstrap