Fixed diff issues