Fix changeset computing for listeners