r6828: More portability fixes