Fixed some issues in the bootstrap process