Fixed import warnings