Updates to support the new bootstrap process.