Move the last of the properties that require a client out of the form.

 Fix some of the errors introduced.