More adjustments to fix the setup