Fix some hooking Mark II