Form fixes

Ditto is a blob of goo.