Fixup: Callbacks merge