fixup! Fixes a couple of bugs on data ingestion and log parsing