Fixed windows stuff