Bug fixes found upon mass ingestion test