Yet more custodian fixes.