final windows fixes