Fix some import warnings