Fix a few bugs in that hook redo
Stuff