Fix little import errors