Minor hook fixes