path/patch fixes in MS