Fix problems with operation tracker