Fix few import errors