Fixing mutual commit problems.