Handle more platform braindamage

5 files changed