Fixes to callback objects, components and references