Fixes for changes to The Hook