Small changes to main/Diff