Fixed up some glaring issues for import stuff