Fix some bugs in the bootstrap variables