[TASK] Small bugs