as_diff fixes