[dataimport, migration] more fixes in the spirit of a6c32edabc8d: [applied]