Some updates for better portability.
 -Erik
7 files changed