a few fixes for find_by_hardware