More custodian bugfixes.
Fix comment.