Fix up some hooks stuff