[TASK] Adapt to recent flux changes