Minor fixes
Renamed variable to match form name