[~TASK] Small changes