[TASK] Minor changes