Form evaluation fixes