Fixed windows integration