Discovery + bootstrap fix