2 fixes of previous commit