KGW Diff fixes