More small portability changes.