Portability tweaks.
2 files changed