windows support - fixes