Imports issues fix