Fixed problems with import.