Fix up change handler registration