etl fixes