Minor changes to callback hooking system