non-linux fixes