Windows-specifics added.