[TASK] More adjustments