Fixed: Missed a couple of hooks in the last commit