Fixed up some ETL stuff