Fixed diff bugs