Fix diff and stat