Minor import changes