More work on data import and environment fixes