Fixup: NULLify not used callbacks