diff fixes2