a few little fixes
a few little fixes


Former-commit-id: 5d3a09536d2702bcf8d3c52eff2ededf81440cfd
Former-commit-id: 30f68ae5a3b3ce12774c6f35fc46d619d694b1c6 [formerly dec76fff65a0eec60d2eee5eb4d80e3eb3fe0aff]
Former-commit-id: 1fb20c047323603610d5872c75067d9cd7634cfc
interrogator/corpkit,interrogator/corpkit