Fix bugs including #70270, docs,
Find dependency better