Some minor changes to etl and api