Fix run_once and add xflux