Improve compatibility with other OS