more diff fixes