Small fixes in the way HOOK/HOOK32 works, still WIP