diff fixes