Fix some fuzzing of forms