Fixed found issues in import