Add some changes to make ETL more suitable for Fedora: