Fixes for loading data from Millennium