More divide by 0 fixes