Fix various missing import/unbound name errors.
4 files changed