Fix unused import warnings