[TASK] some fixes