Set up environ properly.

2 files changed