Fix data import problems