[PATCH] 21.0-b46: hacking on the hook fixes