fix Windows issues