Minor import changes I promised to make