Small updates in the initialization process.