Fixed windows issues