[TASK] Small fixes to adjust for recent Flux changes