Minor tweaks to etl.py