Replace couchforms update

A few things that need to be done to adjust to new couchforms.

(I had already done this in a branch and forgot to PR in the excitement!)