Fixed problems in data import