diffing / conversion fixes