Fix some hooking