Fix a few import errors