Windows-support changes