Merge together few platform dependant things (so we fix build on Linux)