Tidying up import warnings