Fix some additional issues caused by degree(0) == -oo