Making a bit more compatible for different OSes