[TASK] Minor improvements