Fixed bugs stopping initial import