Form tweaks requested by WeHo