Fixed up a few import errors