More portability fixes.