Fixes for Ubuntu/Debian.
Merge pull request #454 from apenney/pe-test-fails

Fixes for Ubuntu/Debian.