Fix missed diff and other small things