Fix some diff issues