Fix diff... A lot