Added a bit of cross-unixness