a bunch of quickfixes for the etl-list-context branch