Fix some auto-revert behavior