Dist control bug fixes