Thrift ingest bugs

Fixing the two issues that poor @raronson hit over the weekend. No excuses for not having this spec in the first place.