Tweak bootstrap process. Closes #166.