Further portability fixes.