Wandows fixes