Fixing autodistrib (not completely solved, ubikit still failing)