more div/0 fixes