Fix os dependent operations