Windows-compatibility changes