- readd some fixes in async target finding