updated fixes for ETL