Fixing some diff stuff.
Blarg