Fix various import issues