Fix importing issues