Minor changes for NT compatibility.