FormData fixes

See individual commits.