Dist task fixes (to be continued)