[TASK] Adapt to recent Flux changes