Check in some minor changes in the hooking