Form fixes. Resolves #4