More adjustments for last changes