form hook fixes