Fix up some 30-silo related test failures.