several fixes to find_* plugins