Misc changes from integration into Flux.