Fix form download

See each commit for the specific fixes.