More diff patch fixes