Review fixes + one more hook