Fixed windows problems