More portability enhancements.