Some fixes after migrating to data files