Portability fix
3 files changed