Fixes infinite loop and max file size.

The infinite loop change has run for 6 hours in sandbox, which has a steady trickle of live data.
The max file size fix is pretty trivial, so I'm comfortable pushing that without sandbox/staging burn in.