bulk data import fixes