Fixed some bugs when importing and others.