* Make some portability fixes.
5 files changed