Fix hook hygiene