[TASK] Small changes