Fix some more diff options changes.