various import fixes