[TASK] Setup tweaks