Some more portability updates
 -Erik
5 files changed