try to eliminate platform differences
3 files changed