Fixed some callback hooks.