Fixed ETL scripts