More adjustments to the init