[TASK] minor adjustments to avoid errors