More portability changes.