Fixup hooks and call wrapper